rpms/vavoom/devel vavoom-1.26-mikmod32.patch, NONE, 1.1 vavoom.spec, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

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


vavoom-1.26-mikmod32.patch:

--- NEW FILE vavoom-1.26-mikmod32.patch ---
diff -up vavoom-1.26/source/s_mikmod.cpp~ vavoom-1.26/source/s_mikmod.cpp
--- vavoom-1.26/source/s_mikmod.cpp~	2008-02-17 20:10:24.000000000 +0100
+++ vavoom-1.26/source/s_mikmod.cpp	2008-02-17 20:10:24.000000000 +0100
@@ -97,6 +97,9 @@ MDRIVER			VMikModAudioCodec::Driver =
 	255,
 #if (LIBMIKMOD_VERSION > 0x030106)
 	"vavoom",
+#if (LIBMIKMOD_VERSION >= 0x030200)
+	"",
+#endif
 	NULL,
 #endif
 	VMikModAudioCodec::Drv_IsThere,


Index: vavoom.spec
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/vavoom.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vavoom.spec	22 Jan 2008 13:30:06 -0000	1.7
+++ vavoom.spec	17 Feb 2008 21:03:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           vavoom
 Version:        1.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -18,6 +18,7 @@
 Source13:       doom-logo.png
 Source14:       tux-b2f.png
 Patch0:         vavoom-1.21-datadir.patch
+Patch1:         vavoom-1.26-mikmod32.patch
 URL:            http://vavoom-engine.com/
 Group:          Amusements/Games
 License:        GPLv2+
@@ -38,6 +39,7 @@
 %prep 
 %setup -q
 %patch0 -p1 -b .datadir
+%patch1 -p1 -b .mikmod32
 
 
 %build
@@ -122,6 +124,10 @@
 
 
 %changelog
+* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.26-2
+- Rebuild for new libmikmod
+- Rebuild with gcc 4.3
+
 * Tue Jan 22 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.26-1
 - New upstream release 1.26