rpms/SDL/devel SDL-1.2.12-multilib.patch, NONE, 1.1 SDL.spec, 1.55, 1.56 SDL-1.2.10-multilib.patch, 1.2, NONE

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9502

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.12-multilib.patch 
Removed Files:
	SDL-1.2.10-multilib.patch 
Log Message:
- fixed latest multiarch conflicts: dropped libdir from sdl-config completely
  (rhbz#343141)



SDL-1.2.12-multilib.patch:

--- NEW FILE SDL-1.2.12-multilib.patch ---
diff -up SDL-1.2.12/sdl-config.in.multilib SDL-1.2.12/sdl-config.in
--- SDL-1.2.12/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
+++ SDL-1.2.12/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
@@ -3,7 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-libdir=@libdir@
 
 @ENABLE_STATIC_FALSE at usage="\
 @ENABLE_STATIC_FALSE at Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
@@ -45,11 +44,11 @@ while test $# -gt 0; do
       echo -I at includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ at ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
 @ENABLE_SHARED_TRUE@      ;;
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ at ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
     *)
       echo "${usage}" 1>&2


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- SDL.spec	28 Aug 2007 16:27:04 -0000	1.55
+++ SDL.spec	6 Nov 2007 16:15:28 -0000	1.56
@@ -1,13 +1,13 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source2: SDL_config.h
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
 Patch19: SDL-1.2.12-preferalsa.patch
-Patch21: SDL-1.2.10-multilib.patch
+Patch21: SDL-1.2.12-multilib.patch
 Patch22: SDL-1.2.11-fixman.patch
 Patch23: SDL-1.2.11-dynamic-esd.patch
 Patch24: SDL-1.2.12-x11dyn64.patch
@@ -125,6 +125,10 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Tue Nov  6 2007 Thomas Woerner <twoerner at redhat.com> 1.2.12-3
+- fixed latest multiarch conflicts: dropped libdir from sdl-config completely
+  (rhbz#343141)
+
 * Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.2.12-2
 - use uname -m in multilib patch instead of arch
 


--- SDL-1.2.10-multilib.patch DELETED ---