diff --git a/.cvsignore b/.cvsignore index 31de224..8f0d94b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -SDL_image-1.2.5.tar.gz +SDL_image-1.2.6.tar.gz diff --git a/SDL_image-1.2.5-IMG_xpm.patch b/SDL_image-1.2.5-IMG_xpm.patch deleted file mode 100644 index 25f0728..0000000 --- a/SDL_image-1.2.5-IMG_xpm.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- IMG_xpm.c~ 2006-05-12 05:02:44.000000000 +0200 -+++ IMG_xpm.c 2006-10-31 19:03:25.000000000 +0100 -@@ -326,7 +326,8 @@ - linebuf = NULL; - buflen = 0; - -- start = SDL_RWtell(src); -+ if(src) -+ start = SDL_RWtell(src); - - if(xpm) - xpmlines = &xpm; -@@ -453,7 +454,8 @@ - - done: - if(error) { -- SDL_RWseek(src, start, SEEK_SET); -+ if (src) -+ SDL_RWseek(src, start, SEEK_SET); - if ( image ) { - SDL_FreeSurface(image); - image = NULL; diff --git a/SDL_image.spec b/SDL_image.spec index 4546df2..54a5497 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -1,13 +1,12 @@ Name: SDL_image -Version: 1.2.5 -Release: 4%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: Image loading library for SDL Group: System Environment/Libraries License: LGPL URL: http://www.libsdl.org/projects/SDL_image/ Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz -Patch0: %{name}-1.2.5-IMG_xpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.10 @@ -37,7 +36,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p0 -b .imgxpm %build @@ -84,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 30 2007 Brian Pepple - 1.2.6-1 +- Update to 1.2.6. +- remove IMG_xpm patch. fixed upstream. + * Tue Dec 19 2006 Brian Pepple - 1.2.5-4 - Disable run-time loading of libs. (#219902) diff --git a/sources b/sources index 38321f4..14cba9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd006109a73bf7dcc93e1c3ed15ee782 SDL_image-1.2.5.tar.gz +b866dc4f647517bdaf57f6ffdefd013e SDL_image-1.2.6.tar.gz