- updated to 2.10.95

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

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 6c1c4fbb464bc6cff526f7180798089fcb74cbbc..179b9736961d16f446f8ae6a871166ac9aac9c60 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -1,19 +1,17 @@
-#
-%define                _realname   fontconfig
-Summary:       Font configuration and customization tools - cross Mingw32 versoin
-Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów - wersja skrośna dla Mingw32
-Name:          crossmingw32-%{_realname}
-Version:       2.4.2
+%define                realname   fontconfig
+Summary:       Font configuration and customization tools - cross MinGW32 versoin
+Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów - wersja skrośna dla MinGW32
+Name:          crossmingw32-%{realname}
+Version:       2.10.95
 Release:       1
 License:       MIT
 Group:         Development/Libraries
-Source0:       http://fontconfig.org/release/%{_realname}-%{version}.tar.gz
-# Source0-md5: f035852f521b54677f2b5c9e2f6d54a4
-Patch0:                %{_realname}-blacklist.patch
-Patch1:                %{_realname}-bitstream-cyberbit.patch
+Source0:       http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
+# Source0-md5: 45c5ba47be70577faa05c3aaf2b6a7e1
+Patch0:                %{realname}-bitstream-cyberbit.patch
 URL:           http://fontconfig.org/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-expat
 BuildRequires: crossmingw32-freetype >= 2.1.5
 BuildRequires: crossmingw32-gcc
@@ -30,10 +28,21 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
-%define                _pkgconfigdir           %{_libdir}/pkgconfig
+%define                _libdir                 %{_prefix}/lib
+%define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %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
+%endif
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 Fontconfig is designed to locate fonts within the system and select
@@ -48,16 +57,16 @@ systemie i wybierania ich w zależności od potrzeb aplikacji.
 Paket ten zawiera wersję skrośną dla Win32.
 
 %package static
-Summary:       Static freetype library (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczna biblioteka freetype (wersja skrośna mingw32)
+Summary:       Static freetype library (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka freetype (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description static
-Static freetype library (cross mingw32 version).
+Static freetype library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka freetype (wersja skrośna mingw32).
+Statyczna biblioteka freetype (wersja skrośna MinGW32).
 
 %package dll
 Summary:       DLL freetype library for Windows
@@ -74,14 +83,13 @@ DLL freetype library for Windows.
 Biblioteka DLL freetype dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -89,7 +97,9 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
        --target=%{target} \
        --host=%{target} \
        --with-arch=%{target} \
-       --disable-docs
+       --with-freetype-config="pkg-config freetype2" \
+       --disable-docs \
+       --disable-silent-rules
 
 %{__make}
 
@@ -107,9 +117,9 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/man
 # runtime
-rm -rf $RPM_BUILD_ROOT/etc/fonts
+%{__rm} -r $RPM_BUILD_ROOT/etc/fonts \
+       $RPM_BUILD_ROOT%{_datadir}/{fontconfig,xml/fontconfig}
 
 %clean
 rm -rf $RPM_BUILD_ROOT