- updated to 2.15.0

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

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index dba3f92a7ab133d3c2884445be11cb7041d1d81f..2c408e905b6bb613bbb085eb52d4769420fbeed1 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -1,29 +1,30 @@
 %define                realname   fontconfig
-Summary:       Font configuration and customization tools - cross MinGW32 versoin
+Summary:       Font configuration and customization tools - cross MinGW32 version
 Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.11.1
-Release:       3
+Version:       2.15.0
+Release:       1
 License:       MIT
 Group:         Development/Libraries
-Source0:       http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
-# Source0-md5: 824d000eb737af6e16c826dd3b2d6c90
+Source0:       https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.xz
+# Source0-md5: 5bb3a2829aecb22ae553c39099bd0d6a
 Patch0:                %{realname}-bitstream-cyberbit.patch
-Patch1:                %{realname}-mingw32.patch
 URL:           http://fontconfig.org/
-BuildRequires: autoconf >= 2.61
+BuildRequires: autoconf >= 2.71
 BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-expat
-BuildRequires: crossmingw32-freetype >= 2.1.5
+BuildRequires: crossmingw32-freetype >= 2.8.1
 BuildRequires: crossmingw32-gcc
-BuildRequires: libtool
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-expat
-Requires:      crossmingw32-freetype >= 2.1.5
+Requires:      crossmingw32-freetype >= 2.8.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
+%define                _enable_debug_packages  0
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
@@ -40,7 +41,8 @@ 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
+# i486 instructions required for atomic operations
+%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,.*
@@ -75,7 +77,7 @@ Summary:      DLL freetype library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL freetype dla Windows
 Group:         Applications/Emulators
 Requires:      crossmingw32-expat-dll
-Requires:      crossmingw32-freetype-dll >= 2.1.5
+Requires:      crossmingw32-freetype-dll >= 2.8.1
 Requires:      wine
 
 %description dll
@@ -87,13 +89,10 @@ Biblioteka DLL freetype dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
-
-# uses POSIX-specific dirent interfaces
-%{__sed} -i -e 's/test-migration//' test/Makefile.am
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -103,7 +102,6 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
        --target=%{target} \
        --host=%{target} \
        --with-arch=%{target} \
-       --with-freetype-config="pkg-config freetype2" \
        --disable-docs \
        --disable-silent-rules \
        --enable-static
@@ -119,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
        fc_cachedir=/dummy
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
@@ -128,14 +126,17 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 # runtime
 %{__rm} -r $RPM_BUILD_ROOT/etc/fonts \
-       $RPM_BUILD_ROOT%{_datadir}/{fontconfig,xml/fontconfig}
+       $RPM_BUILD_ROOT%{_datadir}/{fontconfig,locale,xml/fontconfig}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/fc-*.exe
+# if needed, use ITS data from native package
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gettext/its
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog NEWS README.md
 %{_libdir}/libfontconfig.dll.a
 %{_libdir}/libfontconfig.la
 %{_libdir}/fontconfig.def