- added libpng patch to prefer libpng 1.4.x over 1.2.x/1.0.x

- cleanup, updated BRs

Changed files:
    SDL_image-libpng.patch -> 1.1
    SDL_image.spec -> 1.70

diff --git a/SDL_image-libpng.patch b/SDL_image-libpng.patch
new file mode 100644 (file)
index 0000000..1731bac
--- /dev/null
+++ b/SDL_image-libpng.patch
@@ -0,0 +1,21 @@
+--- SDL_image-1.2.10/configure.in.orig 2009-11-12 07:41:21.000000000 +0100
++++ SDL_image-1.2.10/configure.in      2010-09-07 08:31:57.847130107 +0200
+@@ -205,15 +205,12 @@
+                 png_lib=[`find_lib "libpng*.dll"`]
+                 ;;
+             *)
+-                png_lib=[`find_lib "libpng.so.[0-9]"`]
++                png_lib=[`find_lib "libpng14.so.[0-9][0-9]"`]
+                 if test x$png_lib = x; then
+-                    png_lib=[`find_lib "libpng.so.[0-9]*"`]
++                    png_lib=[`find_lib "libpng12.so.[0-9]"`]
+                 fi
+                 if test x$png_lib = x; then
+-                    png_lib=[`find_lib "libpng*.so.[0-9]"`]
+-                fi
+-                if test x$png_lib = x; then
+-                    png_lib=[`find_lib "libpng*.so.[0-9]*"`]
++                    png_lib=[`find_lib "libpng.so.[0-9]"`]
+                 fi
+                 ;;
+         esac

diff --git a/SDL_image.spec b/SDL_image.spec
index 4918abc2c18359946d0bce45bf37b8738918dbb8..53201a92ea4aa6fa0367dfe90f4a9e4bf8c0a26e 100644 (file)
--- a/SDL_image.spec
+++ b/SDL_image.spec
@@ -8,6 +8,7 @@ License:        LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz
 # Source0-md5: 6c06584b31559e2b59f2b982d0d1f628
+Patch0:                %{name}-libpng.patch
 URL:           http://www.libsdl.org/projects/SDL_image/
 BuildRequires: SDL-devel >= 1.2.10
 BuildRequires: autoconf
@@ -15,12 +16,17 @@ BuildRequires:      automake
 BuildRequires: libjpeg-devel >= 7
 BuildRequires: libpng-devel >= 2:1.2.0
 BuildRequires: libtiff-devel >= 3
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: libtool >= 2:2.0
+BuildRequires: pkgconfig >= 1:0.9.0
 Requires:      SDL >= 1.2.10
 Obsoletes:     libSDL_image1.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# NOTE: libraries dlopened by sonames detected at build time:
+# libjpeg.so.8
+# libpng14.so.14 [note the libpng patch for preferred libs order]
+# libtiff.so.3
+
 %description
 This is a simple library to load images of various formats as SDL
 surfaces. This library currently supports BMP, PPM, PCX, GIF, JPEG,
@@ -71,8 +77,7 @@ Bibliotecas estáticas para desenvolvimento de aplicações SDL.
 
 %prep
 %setup -q
-
-rm -f acinclude.m4
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -117,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES README
 %attr(755,root,root) %{_bindir}/sdlshow
-%attr(755,root,root) %{_libdir}/libSDL_image-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libSDL_image-1.2.so.*.*.*
 %attr(755,root,root) %ghost  %{_libdir}/libSDL_image-1.2.so.0
 
 %files devel