rpms/ClanLib06/devel ClanLib-0.6.5-mikmod32.patch, NONE, 1.1 ClanLib06.spec, 1.9, 1.10

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	ClanLib06.spec 
Added Files:
	ClanLib-0.6.5-mikmod32.patch 
Log Message:
* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-11
- Rebuild for new libmikmod
- Rebuild with gcc 4.3


ClanLib-0.6.5-mikmod32.patch:

--- NEW FILE ClanLib-0.6.5-mikmod32.patch ---
diff -up ClanLib-0.6.5/Sources/MikMod/setupmikmod.cpp~ ClanLib-0.6.5/Sources/MikMod/setupmikmod.cpp
--- ClanLib-0.6.5/Sources/MikMod/setupmikmod.cpp~	2008-02-17 19:14:36.000000000 +0100
+++ ClanLib-0.6.5/Sources/MikMod/setupmikmod.cpp	2008-02-17 19:14:36.000000000 +0100
@@ -32,6 +32,7 @@ MDRIVER drv_clanlib = {
 	255,
 	255, 
 	"clanmikmod",
+	"",   // CmdLineHelp
 	NULL, // Command line
 	CL_Streamed_MikModSample_Session::clanMikMod_IsPresent, // IsPresent
 	VC_SampleLoad,


Index: ClanLib06.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/ClanLib06.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ClanLib06.spec	4 Jan 2008 22:03:59 -0000	1.9
+++ ClanLib06.spec	17 Feb 2008 18:46:11 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:        Version 0.6 of this Cross platform C++ game library
 Name:           ClanLib06
 Version:        0.6.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.clanlib.org/
@@ -15,6 +15,7 @@
 Patch2:         ClanLib-0.6.5-tolua++.patch
 Patch3:         ClanLib-0.6.5-smalljpg.patch
 Patch4:         ClanLib-0.6.5-gcc4.3.patch
+Patch5:         ClanLib-0.6.5-mikmod32.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libGLU-devel
 BuildRequires:  libICE-devel libXxf86vm-devel xorg-x11-proto-devel
@@ -45,6 +46,7 @@
 %patch2 -p1 -z .tolua++
 %patch3 -p1 -z .smalljpg
 %patch4 -p1 -z .gcc43
+%patch5 -p1 -z .mikmod32
 # mark asm files as NOT needing execstack
 for i in `find Sources -name '*.s'`; do
   echo '.section .note.GNU-stack,"", at progbits' >> $i
@@ -66,6 +68,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
+chmod -x $RPM_BUILD_ROOT%{_mandir}/man1/clanlib-config.1*
 
 
 %clean
@@ -92,6 +95,10 @@
 
 
 %changelog
+* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-11
+- Rebuild for new libmikmod
+- Rebuild with gcc 4.3
+
 * Fri Jan  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-10
 - Fix building with gcc 4.3