[mingw32-cairo] Rebuild against libpng 1.5 and various cleanups

[epienbro]

commit 92fdddc1484371c69f7117a8e6a9210c10a5fb29
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jan 31 18:50:13 2012 +0100

    Rebuild against libpng 1.5 and various cleanups
    
    - Rebuild against libpng 1.5
    - Dropped .la files
    - Dropped unneeded RPM tags

 mingw32-cairo.spec |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index 1448651..92f0c78 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -1,20 +1,16 @@
 %global __strip %{_mingw32_strip}
 %global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-cairo
 Version:        1.10.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
 URL:            http://cairographics.org
 Source0:        http://cairographics.org/releases/cairo-%{version}.tar.gz
 Group:          Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The file cairo.c refers to a function called ffs(), but it
 # isn't declared in any of the mingw headers. work around this
@@ -22,7 +18,7 @@ Patch0:         mingw32-cairo-fix-ffs-declaration.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 52
+BuildRequires:  mingw32-filesystem >= 68
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libxml2
@@ -77,30 +73,24 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
 rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/html/cairo/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
 %{_mingw32_bindir}/libcairo-2.dll
 %{_mingw32_bindir}/libcairo-gobject-2.dll
 %{_mingw32_bindir}/libcairo-script-interpreter-2.dll
 %{_mingw32_includedir}/cairo/
 %{_mingw32_libdir}/libcairo.dll.a
-%{_mingw32_libdir}/libcairo.la
 %{_mingw32_libdir}/libcairo-gobject.dll.a
-%{_mingw32_libdir}/libcairo-gobject.la
 %{_mingw32_libdir}/libcairo-script-interpreter.dll.a
-%{_mingw32_libdir}/libcairo-script-interpreter.la
 %{_mingw32_libdir}/pkgconfig/cairo-gobject.pc
 %{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
 %{_mingw32_libdir}/pkgconfig/cairo-png.pc
@@ -111,13 +101,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/pkgconfig/cairo.pc
 
 %files static
-%defattr(-,root,root,-)
 %{_mingw32_libdir}/libcairo.a
 %{_mingw32_libdir}/libcairo-gobject.a
 %{_mingw32_libdir}/libcairo-script-interpreter.a
 
 
 %changelog
+* Tue Jan 23 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.2-6
+- Rebuild against libpng 1.5
+- Dropped .la files
+- Dropped unneeded RPM tags
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild