[mingw-libpng: 18/25] Spec cleanup

[Kalev Lember]

commit a5e9f8ec0689a24e9125bb92c69ca1d0351ad4fe
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Jul 22 13:11:15 2011 +0300

    Spec cleanup
    
    Dropped unused patches, switched to using automatic mingw dep
    extraction, and removed boilerplate code that isn't needed with
    current rpmbuild.
    
    Also dropped mingw32-libpng-fix-invalid-exports.patch, which doesn't
    appear to be needed any more.

 libpng-multilib.patch                    |   23 ----------------
 libpng-pngconf.patch                     |   42 ------------------------------
 mingw32-libpng-fix-invalid-exports.patch |   14 ----------
 mingw32-libpng.spec                      |   25 ++---------------
 4 files changed, 3 insertions(+), 101 deletions(-)
---
diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec
index 3cfcc7c..4ec429d 100644
--- a/mingw32-libpng.spec
+++ b/mingw32-libpng.spec
@@ -1,8 +1,5 @@
 %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-libpng
@@ -13,14 +10,12 @@ Summary:        MinGW Windows Libpng library
 License:        zlib
 URL:            http://www.libpng.org/pub/png/
 Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.xz
-Patch2:         mingw32-libpng-fix-invalid-exports.patch
 
 Group:          Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 68
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
@@ -37,23 +32,13 @@ MinGW Windows Libpng library.
 %prep
 %setup -q -n libpng-%{version}
 
-# The configure script tries to generate a prefix which is used for
-# symbol declarations. However, when this prefix is prefix is used
-# the resulting DLL's don't have any exported symbols at all
-# When we drop this prefix we retain backwards compatibility with
-# older versions of mingw32-libpng. We might need to research this
-# issue more to find out the real cause, but this will do for now
-%patch2 -p0
-
 
 %build
 %{_mingw32_configure} --disable-static
-make
+make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # No need to distribute manpages which appear in the Fedora
@@ -61,12 +46,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc ANNOUNCE CHANGES LICENSE README TODO
 %{_mingw32_bindir}/libpng-config
 %{_mingw32_bindir}/libpng14-14.dll
@@ -87,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 1.4.8 (CVE-2011-2690, CVE-2011-2692)
 - Generate debuginfo subpackage
 - Removed static libs from the main package
+- Spec cleanup
 
 * Wed Jun 29 2011 Richard W.M. Jones <rjones at redhat.com> - 1.4.3-3
 - Include fix for CVE-2011-2501 (RHBZ#717510, RHBZ#717511).