rpms/SDL_mixer/EL-4 SDL_mixer.spec,1.15,1.16 sources,1.4,1.5

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/extras/rpms/SDL_mixer/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25321

Modified Files:
	SDL_mixer.spec sources 
Log Message:
backport for EL-4


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/EL-4/SDL_mixer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SDL_mixer.spec	31 Aug 2006 21:56:08 -0000	1.15
+++ SDL_mixer.spec	9 Jun 2007 05:18:45 -0000	1.16
@@ -1,17 +1,19 @@
 Name:		SDL_mixer
-Version:	1.2.7
-Release:	2%{?dist}
+Version:	1.2.6
+Release:	8%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_mixer/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
-Patch1:		%{name}-%{version}-bad-code.patch
-Patch2:		%{name}-%{version}-volume.patch
-Patch3:		%{name}-%{version}-fix-path-timidity.patch
+Patch1:		%{name}-1.0.6-redhat.patch
+Patch2:		%{name}-1.2.6-libmikmod.patch
+Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Prefix:		%{_prefix}
 BuildRequires:	SDL-devel >= 1.2.4-1 
 BuildRequires:	libvorbis-devel
 BuildRequires:	mikmod-devel >= 3.1.6-26
@@ -20,40 +22,48 @@
 
 
 %description
-A simple multi-channel audio mixer for SDL. It supports 4 channels of
-16 bit stereo audio, plus a single channel of music, mixed by the popular
-MikMod MOD, Timidity MIDI and Ogg Vorbis libraries.
+A simple multi-channel audio mixer for SDL.
+It supports 4 channels of 16 bit stereo audio, plus a single channel
+of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis
+libraries.
 
 
 %package devel
-Summary:	Development files for %{name}
+Summary:	Libraries, includes and more to develop SDL applications using the SDL mixer
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	SDL-devel >= 1.2.4-1
 
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+Development files for SDL_mixer, a simple multi-channel audio mixer for SDL.
+It supports 4 channels of 16 bit stereo audio, plus a single channel
+of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis
+libraries.
+
+You need SDL_mixer-devel if you want to compile an application using SDL_mixer.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .bad_code
-%patch2 -p1 -b .volume
-%patch3 -p1 -b .timidity
+%patch1 -p1 -b .redhat
+%patch2 -p1 -b .libmikmod
+%patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall install-bin
-
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%makeinstall
+/usr/bin/install -d $RPM_BUILD_ROOT/usr/bin
+./libtool --mode=install /usr/bin/install -c playmus $RPM_BUILD_ROOT/usr/bin
+./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %clean
@@ -67,7 +77,7 @@
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc README CHANGES COPYING
 %{_bindir}/playmus
 %{_bindir}/playwave
@@ -75,25 +85,17 @@
 
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root)
+%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_includedir}/SDL
 
 
 %changelog
-* Thu Aug 31 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-2
-- Rebuild for FC6.
-
-* Fri Aug 25 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
-- Update to 1.2.7.
-- Update bad-code & timidity patches.
-- Simplify description & summary for devel package.
-- Use disable-static configure flag.
-- Drop 64bit patch, fixed upstream.
-- Drop libmikmod.patch, fixed upstream.
-- Add patch to allow control volume w/playmus. Bug #203210.
+* Sat Jun 09 2007 Nigel Jones <dev at nigelj.com> - 1.2.6-8
+- SDL_mixer 1.2.6 is latest that will build for EL-4
 
-* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
 - Add patch to fix sound on x86_64. Bug #175672.
 
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Aug 2006 23:25:01 -0000	1.4
+++ sources	9 Jun 2007 05:18:45 -0000	1.5
@@ -1 +1 @@
-7959b89c8f8f1564ca90968f6c88fa1e  SDL_mixer-1.2.7.tar.gz
+2b8beffad9179d80e598c22c80efb135  SDL_mixer-1.2.6.tar.gz