- updated to 2.6.2

[packages/crossmingw32-harfbuzz.git] / crossmingw32-harfbuzz.spec

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index 666eb8e9811f946cef1b9585680168088d5b1b59..93ff4fc584dd1eae68c83393dd04038d2412e7f2 100644 (file)
--- a/crossmingw32-harfbuzz.spec
+++ b/crossmingw32-harfbuzz.spec
@@ -1,26 +1,30 @@
 Summary:       HarfBuzz - internationalized text shaping library - MinGW32 cross version
 Summary(pl.UTF-8):     Rasteryzer fontów TrueType - wersja skrośna dla MinGW32
 Name:          crossmingw32-harfbuzz
-Version:       1.7.6
-Release:       2
+Version:       2.6.2
+Release:       1
 License:       MIT
 Group:         Development/Libraries
-Source0:       https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: ffb94cf2942327344ac31330d07036ba
+Source0:       https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.xz
+# Source0-md5: 1551bb7ebe970d3466787cd26cfa7f76
 Patch0:                harfbuzz-win32.patch
 URL:           https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11.1
+BuildRequires: automake >= 1:1.13.0
 # cairo is used only for utilities, which are not packaged
 #BuildRequires:        crossmingw32-cairo >= 1.8.0
 BuildRequires: crossmingw32-freetype >= 2.9
 BuildRequires: crossmingw32-glib2 >= 2.38
 BuildRequires: crossmingw32-gcc-c++ >= 1:4.7
+BuildRequires: crossmingw32-pthreads-w32
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig >= 1:0.20
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires:      crossmingw32-freetype >= 2.9
 Requires:      crossmingw32-glib2 >= 2.38
 Requires:      crossmingw32-gcc-c++ >= 1:4.7
+Requires:      crossmingw32-pthreads-w32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # see <harfbuzz/internal/ftserv.h>, the real horror
@@ -43,7 +47,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifnarch %{ix86}
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
-%define                optflags        -O2
+%define                optflags        -O2 -march=i486
 %endif
 # -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
@@ -142,6 +146,7 @@ export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
 %configure \
        CPPFLAGS="%{rpmcppflags} -D_GNU_SOURCE" \
        CXXFLAGS="%{rpmcxxflags} -std=gnu++11" \
+       PTHREAD_LIBS="-lpthread" \
        --target=%{target} \
        --build=i686-pc-linux-gnu \
        --host=%{target} \
@@ -167,11 +172,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake/harfbuzz
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/hb*.exe
 %{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}
 
@@ -182,9 +190,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README TODO
 %{_libdir}/libharfbuzz.dll.a
-%{_libdir}/libharfbuzz.la
 %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
@@ -193,11 +202,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/harfbuzz/hb-font.h
 %{_includedir}/harfbuzz/hb-ft.h
 %{_includedir}/harfbuzz/hb-glib.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
@@ -219,11 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %files subset
 %defattr(644,root,root,755)
 %{_libdir}/libharfbuzz-subset.dll.a
-%{_libdir}/libharfbuzz-subset.la
 %{_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
 
 %files subset-static