X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=harfbuzz.spec;h=28cb98a2bdf2e3d0443c82dd95f93550e0935457;hb=9d136b7ae37e4c038cd22fbec11388c85ccfbc66;hp=684db2adde67f5bac32281b8ee477384bf4035f4;hpb=4f528c8f22d694d82801e51b515e75a158fa13c3;p=packages%2Fharfbuzz.git

diff --git a/harfbuzz.spec b/harfbuzz.spec
index 684db2a..28cb98a 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -3,37 +3,40 @@
 %bcond_without	static_libs	# static libraries build
 %bcond_without	graphite2	# Graphite2 library usage
 %bcond_without	icu		# ICU integration
-%bcond_without	tests		# "make check" call
+%bcond_with	tests		# "make check" call (cmap14 test fails as of 2.6.2 +otsanitizer-8.0.0 +fonttools-3.44.0)
 
 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.7.6
+Version:	2.6.8
 Release:	2
 License:	MIT
 Group:		Libraries
-Source0:	https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2
-# Source0-md5:	ffb94cf2942327344ac31330d07036ba
-Patch0:		pc_deps.patch
-URL:		https://www.freedesktop.org/wiki/HarfBuzz
+Source0:	https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	c8d4f2aeed6e576bd42f9dc6def1b1ae
+URL:		https://harfbuzz.github.io/
 BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11.1
+BuildRequires:	automake >= 1:1.13.0
 BuildRequires:	cairo-devel >= 1.8.0
 # hb-fc-list is disabled in util/Makefile.am
 #BuildRequires:	fontconfig-devel
 %{?with_tests:BuildRequires:	fonttools}
-BuildRequires:	freetype-devel >= 1:2.4.2
+BuildRequires:	freetype-devel >= 1:2.9
 BuildRequires:	glib2-devel >= 1:2.38
 BuildRequires:	gobject-introspection-devel >= 1.34.0
-%{?with_graphite2:BuildRequires:	graphite2-devel}
+%{?with_graphite2:BuildRequires:	graphite2-devel >= 1.2.0}
 BuildRequires:	gtk-doc >= 1.15
 %{?with_icu:BuildRequires:	libicu-devel}
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.9
 BuildRequires:	libtool >= 2:2.2
+%{?with_tests:BuildRequires:	otsanitizer >= 8}
 BuildRequires:	pkgconfig >= 1:0.27
 BuildRequires:	sed >= 4.0
-Requires:	freetype >= 1:2.4.2
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	freetype >= 1:2.9
 Requires:	glib2 >= 1:2.38
+%{?with_graphite2:Requires:	graphite2 >= 1.2.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,9 +51,9 @@ 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:	freetype-devel >= 1:2.9
 Requires:	glib2-devel >= 1:2.38
-%{?with_graphite2:Requires:	graphite2-devel}
+%{?with_graphite2:Requires:	graphite2-devel >= 1.2.0}
 Requires:	libstdc++-devel
 
 %description devel
@@ -215,8 +218,6 @@ Dokumentacja API bibliotek HarfBuzz.
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -270,25 +271,34 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libharfbuzz.so
 %dir %{_includedir}/harfbuzz
 %{_includedir}/harfbuzz/hb.h
+%{_includedir}/harfbuzz/hb-aat.h
+%{_includedir}/harfbuzz/hb-aat-layout.h
 %{_includedir}/harfbuzz/hb-blob.h
 %{_includedir}/harfbuzz/hb-buffer.h
 %{_includedir}/harfbuzz/hb-common.h
 %{_includedir}/harfbuzz/hb-deprecated.h
+%{_includedir}/harfbuzz/hb-draw.h
 %{_includedir}/harfbuzz/hb-face.h
 %{_includedir}/harfbuzz/hb-font.h
 %{_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-color.h
+%{_includedir}/harfbuzz/hb-ot-deprecated.h
 %{_includedir}/harfbuzz/hb-ot-font.h
 %{_includedir}/harfbuzz/hb-ot-layout.h
 %{_includedir}/harfbuzz/hb-ot-math.h
+%{_includedir}/harfbuzz/hb-ot-meta.h
+%{_includedir}/harfbuzz/hb-ot-metrics.h
+%{_includedir}/harfbuzz/hb-ot-name.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
 %{_includedir}/harfbuzz/hb-shape.h
+%{_includedir}/harfbuzz/hb-style.h
 %{_includedir}/harfbuzz/hb-unicode.h
 %{_includedir}/harfbuzz/hb-version.h
 %{_pkgconfigdir}/harfbuzz.pc
@@ -350,9 +360,6 @@ rm -rf $RPM_BUILD_ROOT
 %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}