rpms/SDL_mixer/devel SDL_mixer.spec,1.27,1.28

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/SDL_mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4988

Modified Files:
	SDL_mixer.spec 
Log Message:
 Remove dependency on timidity++-patches


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SDL_mixer.spec	23 Feb 2009 23:22:51 -0000	1.27
+++ SDL_mixer.spec	5 Apr 2009 15:16:44 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.8
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -13,18 +13,14 @@
 BuildRequires:	SDL-devel >= 1.2.10 
 BuildRequires:	libvorbis-devel
 BuildRequires:	mikmod-devel >= 3.1.10
-Requires:	timidity++-patches
 # Require libvorbis since we build it with dynamically load support.
 Requires:	libvorbis
-Provides:	SDL_mixer-midi
-
 
 %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.
 
-
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
@@ -36,16 +32,19 @@
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q
 %patch3 -p1 -b .timidity
 
-
 %build
 %configure --disable-dependency-tracking	\
 	   --disable-static 			\
 	   --enable-music-libmikmod
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -55,17 +54,13 @@
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES COPYING
@@ -78,8 +73,10 @@
 %{_libdir}/lib*.so
 %{_includedir}/SDL
 
-
 %changelog
+* Sun Apr  5 2009 Peter Robinson <pbrobinson at gmail.com> - 1.2.8-12
+- Remove dependency on timidity++-patches
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild