- force %{_lib}-independent libdir

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

diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec
index 92cad3519b470e658670e1cfb7f101f48bef1baf..b84c6682884867b979a3da4ae7821dcd1b70ed90 100644 (file)
--- a/crossmingw32-cairo.spec
+++ b/crossmingw32-cairo.spec
@@ -4,14 +4,14 @@
 #
 Summary:       Cairo - multi-platform 2D graphics library - cross Mingw32 version
 Summary(pl.UTF-8):     Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna wersja Mingw32
-%define                _realname   cairo
-Name:          crossmingw32-%{_realname}
-Version:       1.4.4
+%define                realname   cairo
+Name:          crossmingw32-%{realname}
+Version:       1.4.12
 Release:       1
-License:       LGPL v2.1 or MPL v1.1
+License:       LGPL v2.1 or MPL 1.1
 Group:         Development/Libraries
-Source0:       http://cairographics.org/releases/%{_realname}-%{version}.tar.gz
-# Source0-md5: a609118644e1d958d977821c6fd765a9
+Source0:       http://cairographics.org/releases/%{realname}-%{version}.tar.gz
+# Source0-md5: 8e50c2c0d56388e4ee94196c0c7a7904
 URL:           http://cairographics.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1:1.7
@@ -21,7 +21,7 @@ BuildRequires:        crossmingw32-freetype >= 2.1.10
 BuildRequires: crossmingw32-libpng
 BuildRequires: crossmingw32-zlib
 BuildRequires: libtool
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.15
 Requires:      crossmingw32-fontconfig
 Requires:      crossmingw32-freetype >= 2.1.10
 %{?with_glitz:Requires:        crossmingw32-glitz >= 0.5.1}
@@ -32,10 +32,10 @@ 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                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
@@ -101,10 +101,10 @@ DLL cairo library for Windows.
 Biblioteka DLL cairo dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -115,7 +115,6 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
        --target=%{target} \
        --host=%{target} \
        --disable-gtk-doc \
-       --disable-svg \
        --disable-xlib \
        --disable-xlib-render \
        --enable-freetype \
@@ -123,7 +122,8 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
        --enable-pdf \
        --enable-png \
        --enable-ps \
-       --enable-windows \
+       --enable-svg \
+       --enable-windows
 
 %{__make}
 
@@ -153,7 +153,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcairo.dll.a
 %{_libdir}/libcairo.la
 %{_includedir}/cairo
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/cairo.pc
+%{_pkgconfigdir}/cairo-ft.pc
+%{_pkgconfigdir}/cairo-pdf.pc
+%{_pkgconfigdir}/cairo-png.pc
+%{_pkgconfigdir}/cairo-ps.pc
+%{_pkgconfigdir}/cairo-svg.pc
+%{_pkgconfigdir}/cairo-win32.pc
 
 %files static
 %defattr(644,root,root,755)