X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=cairo%2Fmingw-cairo.spec;h=e6a650536732f060c71b5a80fa02be1ba5d28ea1;hb=bfb2581bd208d7f921e65ea388bf6f4f3f90adfb;hp=bb9525ee53aca973406a3cdc18afb9c528db110c;hpb=2e1b8617ce0ac4fe1574cb5caedd2296cd481ef5;p=fedora-mingw.git

diff --git a/cairo/mingw-cairo.spec b/cairo/mingw-cairo.spec
index bb9525e..e6a6505 100644
--- a/cairo/mingw-cairo.spec
+++ b/cairo/mingw-cairo.spec
@@ -1,19 +1,23 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-cairo
 Version:        1.7.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:	LGPLv2 or MPLv1.1
 URL:		http://cairographics.org
-Source0:	http://cairographics.org/releases/cairo-%{version}.tar.gz
+Source0:	http://cairographics.org/snapshots/cairo-%{version}.tar.gz
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libxml2
@@ -21,6 +25,7 @@ BuildRequires:  mingw-pixman
 BuildRequires:  mingw-freetype
 BuildRequires:  mingw-libpng
 BuildRequires:  mingw-fontconfig
+BuildRequires:  pkgconfig
 
 %description
 MinGW Windows Cairo library.
@@ -39,7 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
+
+rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/libcairo.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mingw_bindir}/libcairo-2.dll
 %{_mingw_includedir}/cairo/
-%{_mingw_libdir}/libcairo.a
 %{_mingw_libdir}/libcairo.dll.a
 %{_mingw_libdir}/libcairo.la
 %{_mingw_libdir}/pkgconfig/cairo-ft.pc
@@ -64,5 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-3
+- Added dep on pkgconfig
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-2
+- Remove static libraries.
+- Fix source URL.
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-1
 - Initial RPM release