rpms/vavoom/devel vavoom-1.30-cmake28-fix.patch, NONE, 1.1 vavoom.spec, 1.18, 1.19

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/vavoom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5896

Modified Files:
	vavoom.spec 
Added Files:
	vavoom-1.30-cmake28-fix.patch 
Log Message:
* Fri Nov 20 2009 Hans de Goede <hdegoede at redhat.com> 1.30-4
- Fix building with cmake-2.8.x (#539127)


vavoom-1.30-cmake28-fix.patch:
 CMakeLists.txt |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE vavoom-1.30-cmake28-fix.patch ---
diff -up vavoom-1.30/utils/vlaunch/CMakeLists.txt~ vavoom-1.30/utils/vlaunch/CMakeLists.txt
--- vavoom-1.30/utils/vlaunch/CMakeLists.txt~	2008-10-19 19:43:02.000000000 +0200
+++ vavoom-1.30/utils/vlaunch/CMakeLists.txt	2009-11-20 11:46:46.000000000 +0100
@@ -1,8 +1,7 @@
 if(ENABLE_LAUNCHER)
 
-	find_package(wxWidgets REQUIRED)
-	add_definitions(${wxWidgets_DEFINITIONS})
-	include_directories(${wxWidgets_INCLUDE_DIRS})
+	FIND_PACKAGE(wxWidgets REQUIRED)
+	INCLUDE(${wxWidgets_USE_FILE})
 
 	set(VLAUNCH_SRC vlaunch.cpp)
 


Index: vavoom.spec
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/vavoom.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- vavoom.spec	17 Aug 2009 08:31:50 -0000	1.18
+++ vavoom.spec	20 Nov 2009 12:39:38 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           vavoom
 Version:        1.30
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -20,6 +20,7 @@ Source14:       tux-b2f.png
 Patch0:         vavoom-1.21-datadir.patch
 Patch1:         vavoom-1.27-CMakeLists.patch
 Patch2:         vavoom-1.30-gcc44-fix.patch
+Patch3:         vavoom-1.30-cmake28-fix.patch
 URL:            http://vavoom-engine.com/
 Group:          Amusements/Games
 License:        GPLv2+
@@ -42,6 +43,7 @@ to play these classics under Linux.
 %patch0 -p1 -b .datadir
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -123,6 +125,9 @@ fi
 
 
 %changelog
+* Fri Nov 20 2009 Hans de Goede <hdegoede at redhat.com> 1.30-4
+- Fix building with cmake-2.8.x (#539127)
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.30-3
 - Switch to openal-soft