From dfa9fe57435d79164c57cbfc209ee1d8ac980123e30bde66f96b5a3176407b9c Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 27 Jul 2007 00:09:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/SDL_image?expand=0&rev=4

---
 SDL_image-1.2.5-xcfinc.diff | 12 ------------
 SDL_image-1.2.5.tar.bz2     |  3 ---
 SDL_image-1.2.6.tar.bz2     |  3 +++
 SDL_image.changes           | 12 ++++++++++++
 SDL_image.spec              | 34 ++++++++++++++++++----------------
 5 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 SDL_image-1.2.5-xcfinc.diff
 delete mode 100644 SDL_image-1.2.5.tar.bz2
 create mode 100644 SDL_image-1.2.6.tar.bz2

diff --git a/SDL_image-1.2.5-xcfinc.diff b/SDL_image-1.2.5-xcfinc.diff
deleted file mode 100644
index 8685d25..0000000
--- a/SDL_image-1.2.5-xcfinc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- IMG_xcf.c
-+++ IMG_xcf.c
-@@ -640,7 +640,8 @@
- 	      *row++ = 0xFF000000
- 		| (((Uint32) (*p8)) << 16)
- 		| (((Uint32) (*p8)) << 8)
--		| (((Uint32) (*p8++)) << 0);
-+		| (((Uint32) (*p8)) << 0);
-+		p8++;
- 	    }
- 	    break;	    
- 	  default:
diff --git a/SDL_image-1.2.5.tar.bz2 b/SDL_image-1.2.5.tar.bz2
deleted file mode 100644
index 9043ece..0000000
--- a/SDL_image-1.2.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0c1d80f01cf24e1bbd9fb42d529fa99bfc09b67b44e8365160f3d53871dfa2e
-size 1258132
diff --git a/SDL_image-1.2.6.tar.bz2 b/SDL_image-1.2.6.tar.bz2
new file mode 100644
index 0000000..df6fedf
--- /dev/null
+++ b/SDL_image-1.2.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89d675bea020fed1b28da33587bad884ba886d8b590b70fb545eff78b82183bb
+size 1221313
diff --git a/SDL_image.changes b/SDL_image.changes
index c95f067..4e8f756 100644
--- a/SDL_image.changes
+++ b/SDL_image.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul 25 17:47:08 CEST 2007 - prusnak@suse.cz
+
+- updated to 1.2.6
+  * PNG and TIFF images are correctly identified even if dynamic
+    libraries to load them aren't available
+  * fixed loading of TIFF images using libtiff
+  * fixed static linking with libjpeg
+  * fixed crash in IMG_ReadXPMFromArray()
+- dropped obsolete patch:
+  * xcfinc.diff (included in update)
+
 -------------------------------------------------------------------
 Sun Jul 22 18:50:51 CEST 2007 - aj@suse.de
 
diff --git a/SDL_image.spec b/SDL_image.spec
index bd3b9d5..83a971f 100644
--- a/SDL_image.spec
+++ b/SDL_image.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package SDL_image (Version 1.2.5)
+# spec file for package SDL_image (Version 1.2.6)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -14,14 +14,12 @@ Name:           SDL_image
 BuildRequires:  SDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-libX11-devel
 URL:            http://www.libsdl.org/projects/SDL_image/
 Summary:        Simple DirectMedia Layer--Sample Image Loading Library
-Version:        1.2.5
-Release:        74
+Version:        1.2.6
+Release:        1
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         %{name}-%{version}-xcfinc.diff
 License:        LGPL v2 or later
 Group:          System/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Prefix:         %{_prefix}
 
 %description
 This is a simple library to load images of various formats as SDL
@@ -52,14 +50,9 @@ Authors:
 
 %prep
 %setup -q
-%patch0
 
 %build
 %{?suse_update_config:%{suse_update_config -f }}
-rm acinclude.m4 ; touch acinclude.m4 # Only contains SDL.m4 and libtool.m4
-libtoolize --copy --force 
-aclocal
-autoconf
 %configure
 make %{?jobs:-j %jobs}
 
@@ -67,10 +60,10 @@ make %{?jobs:-j %jobs}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %post
-%run_ldconfig
+/sbin/ldconfig
 
 %postun
-%run_ldconfig
+/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,15 +71,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README CHANGES COPYING
-%{prefix}/%_lib/lib*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{prefix}/%_lib/*a
-%{prefix}/include/SDL/
-%{prefix}/%_lib/lib*.so
+%{_libdir}/*a
+%{_includedir}/SDL
+%{_libdir}/lib*.so
 
 %changelog
+* Wed Jul 25 2007 - prusnak@suse.cz
+- updated to 1.2.6
+  * PNG and TIFF images are correctly identified even if dynamic
+  libraries to load them aren't available
+  * fixed loading of TIFF images using libtiff
+  * fixed static linking with libjpeg
+  * fixed crash in IMG_ReadXPMFromArray()
+- dropped obsolete patch:
+  * xcfinc.diff (included in update)
 * Sun Jul 22 2007 - aj@suse.de
 - Cleanup build requires.
 * Fri Mar 02 2007 - prusnak@suse.cz