X-Git-Url: http://git.pld-linux.org/?p=packages%2Fharfbuzz.git;a=blobdiff_plain;f=harfbuzz.spec;h=270236b7e724ecf1dc826031f7d5b63adf99b9c2;hp=612ea0f3b83fad27cab4b1fbdbe561ee03b0f397;hb=96bcd956f5160358a202c6de06f26c4cc21e9a91;hpb=d7327b58e9f882f423efcff5d6dca1c8bf811d22

diff --git a/harfbuzz.spec b/harfbuzz.spec
index 612ea0f..270236b 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -8,30 +8,33 @@
 Summary:	HarfBuzz - internationalized text shaping library
 Summary(pl.UTF-8):	HarfBuzz - biblioteka rysująca tekst z obsługą wielu języków
 Name:		harfbuzz
-Version:	1.0.2
+Version:	1.8.1
 Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2
-# Source0-md5:	e74f644045fe42c38a2641fc1e82a800
-URL:		http://www.freedesktop.org/wiki/HarfBuzz
+Source0:	https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2
+# Source0-md5:	1023806c6a25a3fb11af0bcee8d0dc7c
+Patch0:		pc_deps.patch
+URL:		https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11.1
 BuildRequires:	cairo-devel >= 1.8.0
 # hb-fc-list is disabled in util/Makefile.am
 #BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel >= 1:2.4.2
-BuildRequires:	glib2-devel >= 1:2.16
+%{?with_tests:BuildRequires:	fonttools}
+BuildRequires:	freetype-devel >= 1:2.9
+BuildRequires:	glib2-devel >= 1:2.38
 BuildRequires:	gobject-introspection-devel >= 1.34.0
 %{?with_graphite2:BuildRequires:	graphite2-devel}
 BuildRequires:	gtk-doc >= 1.15
 %{?with_icu:BuildRequires:	libicu-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.2
-BuildRequires:	pkgconfig >= 1:0.20
+%{?with_tests:BuildRequires:	otsanitizer}
+BuildRequires:	pkgconfig >= 1:0.27
 BuildRequires:	sed >= 4.0
-Requires:	freetype >= 1:2.4.2
-Requires:	glib2 >= 1:2.16
+Requires:	freetype >= 1:2.9
+Requires:	glib2 >= 1:2.38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,8 +49,8 @@ Summary:	Header files for HarfBuzz library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki HarfBuzz
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	freetype-devel >= 1:2.4.2
-Requires:	glib2-devel >= 1:2.16
+Requires:	freetype-devel >= 1:2.9
+Requires:	glib2-devel >= 1:2.38
 %{?with_graphite2:Requires:	graphite2-devel}
 Requires:	libstdc++-devel
 
@@ -87,7 +90,6 @@ Summary(pl.UTF-8):	Pliki nagłówkowe interfejsu GObject do biblioteki Harfbuzz
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-gobject = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.12.2
 
 %description gobject-devel
 This is the package containing the header files for Harfbuzz GObject
@@ -147,6 +149,43 @@ Static HarfBuzz ICU library.
 %description icu-static -l pl.UTF-8
 Biblioteka statyczna HarfBuzz ICU.
 
+%package subset
+Summary:	HarfBuzz text shaping library - font subsetter
+Summary(pl.UTF-8):	Biblioteka HarfBuzz do rysowania tekstu - font subsetter
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description subset
+HarfBuzz text shaping library - font subsetter.
+
+%description subset -l pl.UTF-8
+Biblioteka HarfBuzz do rysowania tekstu - font subsetter.
+
+%package subset-devel
+Summary:	Header files for HarfBuzz subset library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki HarfBuzz subset
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-subset = %{version}-%{release}
+
+%description subset-devel
+Header files for HarfBuzz subset library.
+
+%description subset-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki HarfBuzz subset.
+
+%package subset-static
+Summary:	Static HarfBuzz subset library
+Summary(pl.UTF-8):	Biblioteka statyczna HarfBuzz subset
+Group:		Development/Libraries
+Requires:	%{name}-subset-devel = %{version}-%{release}
+
+%description subset-static
+Static HarfBuzz subset library.
+
+%description subset-static -l pl.UTF-8
+Biblioteka statyczna HarfBuzz subset.
+
 %package progs
 Summary:	HarfBuzz command-line utilities
 Summary(pl.UTF-8):	Narzędzia HarfBuzz uruchamiane z linii poleceń
@@ -177,10 +216,7 @@ Dokumentacja API bibliotek HarfBuzz.
 %prep
 %setup -q
 
-# missing dependencies
-cat >> src/harfbuzz.pc.in <<EOF
-Requires.private: glib-2.0 freetype2%{?with_graphite2: graphite2}
-EOF
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -221,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
 %post	icu -p /sbin/ldconfig
 %postun	icu -p /sbin/ldconfig
 
+%post	subset -p /sbin/ldconfig
+%postun	subset -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
@@ -241,10 +280,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/harfbuzz/hb-ft.h
 %{_includedir}/harfbuzz/hb-glib.h
 %{?with_graphite2:%{_includedir}/harfbuzz/hb-graphite2.h}
+%{_includedir}/harfbuzz/hb-map.h
 %{_includedir}/harfbuzz/hb-ot-font.h
 %{_includedir}/harfbuzz/hb-ot-layout.h
+%{_includedir}/harfbuzz/hb-ot-math.h
 %{_includedir}/harfbuzz/hb-ot-shape.h
 %{_includedir}/harfbuzz/hb-ot-tag.h
+%{_includedir}/harfbuzz/hb-ot-var.h
 %{_includedir}/harfbuzz/hb-ot.h
 %{_includedir}/harfbuzz/hb-set.h
 %{_includedir}/harfbuzz/hb-shape-plan.h
@@ -252,6 +294,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/harfbuzz/hb-unicode.h
 %{_includedir}/harfbuzz/hb-version.h
 %{_pkgconfigdir}/harfbuzz.pc
+%dir %{_libdir}/cmake/harfbuzz
+%{_libdir}/cmake/harfbuzz/harfbuzz-config.cmake
 
 %if %{with static_libs}
 %files static
@@ -299,10 +343,31 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+%files subset
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libharfbuzz-subset.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libharfbuzz-subset.so.0
+
+%files subset-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libharfbuzz-subset.so
+%{_includedir}/harfbuzz/hb-subset.h
+%{_includedir}/harfbuzz/hb-subset-glyf.hh
+%{_includedir}/harfbuzz/hb-subset-plan.hh
+%{_includedir}/harfbuzz/hb-subset-private.hh
+%{_pkgconfigdir}/harfbuzz-subset.pc
+
+%if %{with static_libs}
+%files subset-static
+%defattr(644,root,root,755)
+%{_libdir}/libharfbuzz-subset.a
+%endif
+
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/hb-ot-shape-closure
 %attr(755,root,root) %{_bindir}/hb-shape
+%attr(755,root,root) %{_bindir}/hb-subset
 %attr(755,root,root) %{_bindir}/hb-view
 
 %files apidocs