- updated to 2.6.0

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

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index c4f64991035b6bb8fa845e2655cad5b760786ddd..67f98dd56ecedb6decc6a5f23a06427d2dd46998 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -1,16 +1,15 @@
-#
-%define                _realname   fontconfig
+%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
+Name:          crossmingw32-%{realname}
+Version:       2.6.0
 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.gz
+# Source0-md5: ab54ec1d4ddd836313fdbc0cd5299d6d
+Patch0:                %{realname}-blacklist.patch
+Patch1:                %{realname}-bitstream-cyberbit.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -18,7 +17,7 @@ BuildRequires:        crossmingw32-expat
 BuildRequires: crossmingw32-freetype >= 2.1.5
 BuildRequires: crossmingw32-gcc
 BuildRequires: libtool
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.15
 Requires:      crossmingw32-expat
 Requires:      crossmingw32-freetype >= 2.1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,11 +26,11 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
 
 %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++
@@ -75,12 +74,12 @@ 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_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -97,7 +96,7 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}