[mingw-SDL_image: 7/13] Disabled png support for now and various cleanups

[Kalev Lember]

commit 66f55647e103157e36932ba65a2e8f2e190cb0f5
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jan 31 20:30:54 2012 +0100

    Disabled png support for now and various cleanups
    
    - Disabled png support for now as SDL_image isn't compatible with libpng 1.5 yet
    - Dropped the dependency extraction overrides as that's done automatically as of RPM 4.9
    - Dropped unneeded RPM tags

 mingw32-SDL_image.spec |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/mingw32-SDL_image.spec b/mingw32-SDL_image.spec
index 167bc02..e132fc8 100644
--- a/mingw32-SDL_image.spec
+++ b/mingw32-SDL_image.spec
@@ -1,28 +1,23 @@
 %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-SDL_image
 Version:        1.2.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows port of the Image loading library for SDL
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.libsdl.org/projects/SDL_image/
 Source0:        http://www.libsdl.org/projects/SDL_image/release/SDL_image-%{version}.tar.gz
-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-dlfcn
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-SDL
 BuildRequires:  mingw32-libpng
@@ -37,7 +32,7 @@ designed to provide fast access to the graphics frame buffer and audio
 device.  This package contains a simple library for loading images of
 various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 
-%{_mingw32_description}
+%{?_mingw32_description}
 
 %{?_mingw32_debug_package}
 
@@ -51,13 +46,13 @@ various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
     --disable-jpg-shared \
     --disable-png-shared \
     --disable-tif-shared \
+    --disable-png \
     --disable-static
 #    --disable-dependency-tracking \
 
 make %{?smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # silence rpmlint:
@@ -65,11 +60,7 @@ iconv --from=ISO-8859-1 --to=UTF-8 CHANGES > CHANGES.new && \
 touch -r CHANGES CHANGES.new && \
 mv CHANGES.new CHANGES
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc README CHANGES COPYING
 %{_mingw32_bindir}/SDL_image.dll
 %{_mingw32_libdir}/libSDL_image.dll.a
@@ -78,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_includedir}/SDL
 
 %changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.10-6
+- Disabled png support for now as SDL_image isn't compatible with libpng 1.5 yet
+- Dropped the dependency extraction overrides as that's done automatically as of RPM 4.9
+- Dropped unneeded RPM tags
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild