X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-fontconfig.git;a=blobdiff_plain;f=crossmingw32-fontconfig.spec;h=2c6afa21cae972d59a4157f5172543b7f09d6d67;hp=48b82404ebd6b6e2a1d51cdc643950529e547d59;hb=HEAD;hpb=5efa4a16bd846d07f3d4125b8381615ddae3e93a

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 48b8240..2c408e9 100644
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -1,27 +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.10.92
+Version:	2.15.0
 Release:	1
 License:	MIT
 Group:		Development/Libraries
-Source0:	http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
-# Source0-md5:	d69aa42da134038d2145d8f31a085620
+Source0:	https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.xz
+# Source0-md5:	5bb3a2829aecb22ae553c39099bd0d6a
 Patch0:		%{realname}-bitstream-cyberbit.patch
 URL:		http://fontconfig.org/
-BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake
+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
@@ -33,10 +36,13 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+%define		__pkgconfig_requires	%{nil}
 
 %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,.*
@@ -71,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
@@ -86,6 +92,7 @@ Biblioteka DLL freetype dla Windows.
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -95,20 +102,22 @@ 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
+	--disable-silent-rules \
+	--enable-static
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# fc_cachedir=/dummy is to avoid creating ${DESTDIR}LOCAL_APPDATA_FONTCONFIG_CACHE dir
 %{__make} -j1 install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$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
@@ -117,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