rpms/SDL_image/FC-4 .cvsignore, 1.2, 1.3 SDL_image.spec, 1.3, 1.4 sources, 1.2, 1.3 SDL_image-1.2.3-autofoo.patch, 1.1, NONE SDL_image-ppc64.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859

Modified Files:
	.cvsignore SDL_image.spec sources 
Removed Files:
	SDL_image-1.2.3-autofoo.patch SDL_image-ppc64.patch 
Log Message:
* Tue Sep 27 2005 Brian Pepple <bdpepple at ameritech.net> - 1.2.4-1
- Bump release so it upgrades from FC4.
- General spec formatting cleanup.
- 1.2.4, patches obsolete.
- Bring back TIFF support (BuildRequire libtiff-devel).
- Build with dependency tracking disabled.
- Require exact EVR of main package in -devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2005 18:02:32 -0000	1.2
+++ .cvsignore	27 Sep 2005 21:33:30 -0000	1.3
@@ -1 +1 @@
-SDL_image-1.2.3.tar.gz
+SDL_image-1.2.4.tar.gz


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-4/SDL_image.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SDL_image.spec	27 May 2005 20:04:38 -0000	1.3
+++ SDL_image.spec	27 Sep 2005 21:33:30 -0000	1.4
@@ -1,15 +1,19 @@
-Summary: A sample image loading library for SDL.
-Name: SDL_image
-Version: 1.2.3
-Release: 9
-Source: http://www.libsdl.org/projects/SDL_image/src/%{name}-%{version}.tar.gz
-Patch: SDL_image-ppc64.patch
-Patch2: SDL_image-1.2.3-autofoo.patch
-URL: http://www.libsdl.org/projects/SDL_image/index.html
-License: LGPL
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: SDL-devel >= 1.2.4-1, libjpeg-devel, libpng-devel
+Name:		SDL_image
+Version:	1.2.4
+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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: 	SDL-devel >= 1.2.4-1
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libtiff-devel
+
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -17,11 +21,13 @@
 device.  This package contains a simple library for loading images of
 various formats (BMP, PPM, PCX, GIF, JPEG, PNG) as SDL surfaces.
 
+
 %package devel
-Summary: Development files for the SDL image loading library.
-Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: SDL-devel >= 1.2.3-5
+Summary:	Development files for the SDL image loading library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	SDL-devel >= 1.2.4-1
+
 
 %description devel
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -29,50 +35,59 @@
 device.  This package contains the files needed for development using
 the SDL image loading library contained in the SDL_image package.
 
-%prep
 
+%prep
 %setup -q
-%patch -p1 -b .ppc64
-%patch2 -p1 -b .autofoo
+
 
 %build
-# replaced by patch
-#libtoolize --copy --force
-#aclocal
-#autoconf
-#automake --foreign --include-deps --add-missing --force-missing --copy -a
-%configure --enable-tif
+# XCF support is crashy in 1.2.4
+%configure --disable-dependency-tracking --enable-tif
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc README CHANGES COPYING
 %{_bindir}/showimage
 %{_libdir}/lib*.so.*
 
+
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.a
 %{_libdir}/lib*.so
 %{_includedir}/SDL/*
 
+
 %changelog
+* Tue Sep 27 2005 Brian Pepple <bdpepple at ameritech.net> - 1.2.4-1
+- Bump release so it upgrades from FC4.
+- General spec formatting cleanup.
+- 1.2.4, patches obsolete.
+- Bring back TIFF support (BuildRequire libtiff-devel).
+- Build with dependency tracking disabled.
+- Require exact EVR of main package in -devel.
+
 * Thu May 26 2005 Bill Nottingham <notting at redhat.com> 1.2.3-9
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2005 18:02:32 -0000	1.2
+++ sources	27 Sep 2005 21:33:30 -0000	1.3
@@ -1 +1 @@
-d55826ffbd2bdc48b09cc64a9ed9e59e  SDL_image-1.2.3.tar.gz
+70bf617f99e51a2c94550fc79d542f0b  SDL_image-1.2.4.tar.gz


--- SDL_image-1.2.3-autofoo.patch DELETED ---


--- SDL_image-ppc64.patch DELETED ---