Merge branch 'upstream' into tizen

diff --cc packaging/harfbuzz.spec
index 02f2cf1,0000000..6104e80
mode 100644,000000..100644
--- 1/packaging/harfbuzz.spec
--- /dev/null
+++ b/packaging/harfbuzz.spec
@@@ -1,80 -1,0 +1,80 @@@
- Version:        1.3.0
 +Name:           harfbuzz
++Version:        1.4.6
 +Release:        0
 +License:        MIT
 +Summary:        An OpenType text shaping engine
 +Url:            http://www.freedesktop.org/wiki/Software/HarfBuzz
 +Group:          Graphics/Font Management
 +Source:         %{name}-%{version}.tar.bz2
 +Source99:       baselibs.conf
 +Source1001:   harfbuzz.manifest
 +BuildRequires:  gcc-c++
 +#BuildRequires:  pkgconfig(cairo) >= 1.8.0
 +#BuildRequires:  pkgconfig(cairo-ft)
 +BuildRequires:  pkgconfig(freetype2) >= 2.3.8
 +BuildRequires:  pkgconfig(glib-2.0) >= 2.16
 +BuildRequires:  pkgconfig(gobject-2.0)
 +BuildRequires:  pkgconfig(gthread-2.0)
 +BuildRequires:  pkgconfig(icu-uc)
 +
 +%description
 +HarfBuzz is an OpenType text shaping engine.
 +
 +%package -n libharfbuzz
 +Summary:        An OpenType text shaping engine
 +Group:          Graphics/Font Management
 +
 +%description -n libharfbuzz
 +HarfBuzz is an OpenType text shaping engine.
 +
 +%package tools
 +Summary:        An OpenType text shaping engine -- Tools
 +Group:          Graphics/Font Management
 +
 +%description tools
 +HarfBuzz is an OpenType text shaping engine.
 +
 +%package devel
 +Summary:        An OpenType text shaping engine -- Development Files
 +Group:          Development/Libraries
 +Requires:       libharfbuzz = %{version}
 +
 +%description devel
 +HarfBuzz is an OpenType text shaping engine.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +%configure \
 +        --disable-static
 +make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +rm -rf %{buildroot}/%{_datadir}/gtk-doc
 +
 +%post -n libharfbuzz -p /sbin/ldconfig
 +
 +%postun -n libharfbuzz -p /sbin/ldconfig
 +
 +%files -n libharfbuzz
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%license COPYING
 +%{_libdir}/*.so.0*
 +
 +%files tools
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_bindir}/hb-ot-shape-closure
 +%{_bindir}/hb-shape
 +#%{_bindir}/hb-view
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_includedir}/harfbuzz/
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc