rpms/vavoom/devel vavoom-1.27-CMakeLists.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vavoom.spec, 1.9, 1.10 vavoom-1.24-CVE-2007-4533-5.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources vavoom.spec 
Added Files:
	vavoom-1.27-CMakeLists.patch 
Removed Files:
	vavoom-1.24-CVE-2007-4533-5.patch 
Log Message:
* Wed Apr  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.27-1
- New upstream release 1.27


vavoom-1.27-CMakeLists.patch:

--- NEW FILE vavoom-1.27-CMakeLists.patch ---
diff -up vavoom-1.27/utils/glbsp/CMakeLists.txt~ vavoom-1.27/utils/glbsp/CMakeLists.txt
--- vavoom-1.27/utils/glbsp/CMakeLists.txt~	2008-04-02 20:48:23.000000000 +0200
+++ vavoom-1.27/utils/glbsp/CMakeLists.txt	2008-04-02 20:48:23.000000000 +0200
@@ -1,7 +1,7 @@
 include_directories(${ZLIB_INCLUDE_DIR})
 add_definitions(-DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline)
 
-add_library(glbsp
+add_library(glbsp STATIC
 	analyze.c
 	analyze.h
 	blockmap.c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Jan 2008 13:30:06 -0000	1.5
+++ .cvsignore	2 Apr 2008 20:16:35 -0000	1.6
@@ -1 +1 @@
-vavoom-1.26.tar.bz2
+vavoom-1.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jan 2008 13:30:06 -0000	1.5
+++ sources	2 Apr 2008 20:16:35 -0000	1.6
@@ -1 +1 @@
-4fb8d126faa5b37e0737674338a0f7ca  vavoom-1.26.tar.bz2
+e78738b3e5e4c14dd841ade08360f88b  vavoom-1.27.tar.bz2


Index: vavoom.spec
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/vavoom.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vavoom.spec	3 Mar 2008 19:42:14 -0000	1.9
+++ vavoom.spec	2 Apr 2008 20:16:35 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           vavoom
-Version:        1.26
-Release:        3%{?dist}
+Version:        1.27
+Release:        1%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -19,6 +19,7 @@
 Source14:       tux-b2f.png
 Patch0:         vavoom-1.21-datadir.patch
 Patch1:         vavoom-1.26-mikmod32.patch
+Patch2:         vavoom-1.27-CMakeLists.patch
 URL:            http://vavoom-engine.com/
 Group:          Amusements/Games
 License:        GPLv2+
@@ -40,20 +41,18 @@
 %setup -q
 %patch0 -p1 -b .datadir
 %patch1 -p1 -b .mikmod32
+%patch2 -p1
 
 
 %build
-# Disable allegro, we can use either SDL or allegro. Since SDL is used more
-# widely we use that. We could in the future build both versions.
-%configure --without-allegro --without-libmad --enable-debug
+%cmake -DWITH_LIBMAD:BOOL=OFF
 
 # This one line sed command is easier than trying to muck with the Makefile
 # to add the proper -D definition.
 sed -i "s|#define FL_BASEDIR.*|#define FL_BASEDIR \"%{_datadir}/%{name}\"|" source/files.h
 sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/config.h
 
-# The Makefile doesn't do parallel builds correctly.  Don't add smp_mflags.
-make
+make VERBOSE=1
 
 
 %install
@@ -124,6 +123,9 @@
 
 
 %changelog
+* Wed Apr  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.27-1
+- New upstream release 1.27
+
 * Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.26-3
 - Change Requires: timidity++ to timidity++-patches, as we just need the
   patches


--- vavoom-1.24-CVE-2007-4533-5.patch DELETED ---