diff --git a/ClanLib-0.6.5-mikmod32.patch b/ClanLib-0.6.5-mikmod32.patch new file mode 100644 index 0000000..a792d78 --- /dev/null +++ b/ClanLib-0.6.5-mikmod32.patch @@ -0,0 +1,11 @@ +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, diff --git a/ClanLib06.spec b/ClanLib06.spec index 7ca19e7..feaa962 100644 --- a/ClanLib06.spec +++ b/ClanLib06.spec @@ -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 @@ Patch1: ClanLib-0.6.5-suse.patch 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 @@ ClanLib 0.6 development headers and libraries %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,"",@progbits' >> $i @@ -66,6 +68,7 @@ make %{?_smp_mflags} 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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 17 2008 Hans de Goede 0.6.5-11 +- Rebuild for new libmikmod +- Rebuild with gcc 4.3 + * Fri Jan 4 2008 Hans de Goede 0.6.5-10 - Fix building with gcc 4.3