rpms/SDLmm/devel SDLmm-0.1.8-multilib.patch, NONE, 1.1 SDLmm.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/SDLmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12009

Modified Files:
	SDLmm.spec 
Added Files:
	SDLmm-0.1.8-multilib.patch 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.8-6
- Fix sdlmm-config multilib conflict (bz 343151)


SDLmm-0.1.8-multilib.patch:

--- NEW FILE SDLmm-0.1.8-multilib.patch ---
diff -up SDLmm-0.1.8/sdlmm-config.in~ SDLmm-0.1.8/sdlmm-config.in
--- SDLmm-0.1.8/sdlmm-config.in~	2007-10-21 22:01:55.000000000 +0200
+++ SDLmm-0.1.8/sdlmm-config.in	2007-10-21 22:01:55.000000000 +0200
@@ -42,8 +42,7 @@ while test $# -gt 0; do
       echo $includes -I at includedir@/SDLmm @SDLMM_CXXFLAGS@
       ;;
     --libs)
-      libdirs="-L at libdir@ @SDLMM_RLD_FLAGS@"
-      echo $libdirs @SDLMM_LIBS@
+      echo @SDLMM_LIBS@
       ;;
     *)
       echo "${usage}" 1>&2


Index: SDLmm.spec
===================================================================
RCS file: /cvs/extras/rpms/SDLmm/devel/SDLmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SDLmm.spec	3 Aug 2007 18:11:39 -0000	1.3
+++ SDLmm.spec	21 Oct 2007 20:12:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           SDLmm
 Version:        0.1.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        C++ interface for the popular SDL library
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -9,6 +9,7 @@
 Source1:        license-clarification.eml
 Patch0:         SDLmm-0.1.8-asc-fixes.patch
 Patch1:         SDLmm-0.1.8-aclocal.patch
+Patch2:         SDLmm-0.1.8-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel
 
@@ -37,6 +38,7 @@
 %setup -q
 %patch0 -p1 -z .asc
 %patch1 -p1 -z .aclocal
+%patch2 -p1 -z .multilib
 cp %{SOURCE1} .
 # configure adds -lm to the LIBS to link in while it isn't used, and doesn't
 # add -lstdc++, so we fix those both in one go here.
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.8-6
+- Fix sdlmm-config multilib conflict (bz 343151)
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.1.8-5
 - Update License tag for new Licensing Guidelines compliance