Wed May 7 05:30:48 UTC 2008

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources vegastrike-0.4.2-paths-fix.patch 
	vegastrike-0.4.2-posh-fix.patch 
	vegastrike-0.4.2-vssetup-fix.patch 
	vegastrike-0.4.3-64-bit.patch vegastrike-0.4.3-openal.patch 
	vegastrike-0.4.3-sys-python.patch vegastrike-wrapper.sh 
	vegastrike.desktop vegastrike.spec 
Removed Files:
	vegastrike-0.4.2-launcher-fix.patch 
	vegastrike-0.4.2-opengl-fix.patch 
	vegastrike-0.4.3-alut-fixes.patch vegastrike-0.4.3-ppc.patch 
	vegastrike-0.4.3-use-system-boost.patch 
Log Message:
* Sat May  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
- New upstream release 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	10 May 2007 19:18:00 -0000	1.2
+++ .cvsignore	7 May 2008 05:30:12 -0000	1.3
@@ -1,3 +1,2 @@
-vegastrike-0.4.3.tar.bz2
+vegastrike-src-0.5.0.tar.bz2
 vegastrike-manpages.tar.bz2
-vssetup.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 May 2007 19:18:00 -0000	1.2
+++ sources	7 May 2008 05:30:12 -0000	1.3
@@ -1,3 +1,2 @@
-fa000442a6c613c15500ce5d502c6e72  vegastrike-0.4.3.tar.bz2
-fa990bbfe29ffdd6bc67bc0ca41fc0da  vegastrike-manpages.tar.bz2
-cae140766a7f7ade76e61300b7807f77  vssetup.tar.bz2
+8cfd7d1691173652e14fc89e4da97d1a  vegastrike-src-0.5.0.tar.bz2
+4448504e092c591d01e227e3a275557c  vegastrike-manpages.tar.bz2

vegastrike-0.4.2-paths-fix.patch:

Index: vegastrike-0.4.2-paths-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.2-paths-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-0.4.2-paths-fix.patch	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-0.4.2-paths-fix.patch	7 May 2008 05:30:12 -0000	1.2
@@ -1,18 +1,47 @@
-diff -urN vegastrike-0.4.2.orig/src/main.cpp vegastrike-0.4.2/src/main.cpp
---- vegastrike-0.4.2.orig/src/main.cpp	2004-08-16 03:01:08.000000000 -0400
-+++ vegastrike-0.4.2/src/main.cpp	2004-11-22 17:37:18.000000000 -0500
-@@ -230,7 +230,7 @@
-   if (g_game.music_enabled) {
+diff -up vegastrike-source-0.5.0/src/cmd/music.cpp.foobar vegastrike-source-0.5.0/src/cmd/music.cpp
+--- vegastrike-source-0.5.0/src/cmd/music.cpp.foobar	2008-05-02 12:02:12.000000000 +0200
++++ vegastrike-source-0.5.0/src/cmd/music.cpp	2008-05-02 12:08:50.000000000 +0200
+@@ -120,9 +120,7 @@ Music::Music (Unit *parent):random(false
+   if (g_game.music_enabled&&!soundServerPipes()) {
      int pid=fork();
      if (!pid) {
 -	  string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
-+	  string soundserver_path = "/usr/libexec/vegastrike/soundserver";
-       pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
-       soundserver_path = VSFileSystem::datadir+"/soundserver";
+-      pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
+-      soundserver_path = VSFileSystem::datadir+"/soundserver";
++ 	  string soundserver_path = "/usr/libexec/vegastrike/soundserver";
        pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),NULL);
---- vegastrike-0.4.3/src/gfx/mesh_xml.cpp~	2007-03-23 12:02:27.000000000 +0100
-+++ vegastrike-0.4.3/src/gfx/mesh_xml.cpp	2007-03-23 12:02:27.000000000 +0100
-@@ -1165,7 +1165,7 @@
+       g_game.music_enabled=false;
+       VSFileSystem::vs_fprintf(stderr,"Unable to spawn music player server\n");
+@@ -190,24 +188,9 @@ Music::Music (Unit *parent):random(false
+       }
+ #else
+   if (g_game.music_enabled) {
+-    std::string tmp=VSFileSystem::datadir+"/bin/soundserver";
+-    FILE * fp=fopen (tmp.c_str(),"rb");
+-    if (!fp) {
+-      tmp=VSFileSystem::datadir+"/soundserver";
+-      fp = fopen(tmp.c_str(),"rb");
+-      if (!fp){
+-        g_game.music_enabled=false;
+-        socketw=-1;
+-        socketr=-1;
+-      }else fclose(fp);
+-    }else fclose(fp);
+-  }
+-  if (g_game.music_enabled) {
+     int pid=fork();
+     if (!pid) {
+-	  string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
+-      pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),buffer1,buffer2,NULL);
+-      soundserver_path = VSFileSystem::datadir+"/soundserver";
++ 	  string soundserver_path = "/usr/libexec/vegastrike/soundserver";
+       pid=execlp(soundserver_path.c_str() , soundserver_path.c_str(),buffer1,buffer2,NULL);
+       g_game.music_enabled=false;
+       VSFileSystem::vs_fprintf(stderr,"Unable to spawn music player server\n");
+diff -up vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp.foobar vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp
+--- vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp.foobar	2008-04-26 12:00:33.000000000 +0200
++++ vegastrike-source-0.5.0/src/gfx/mesh_xml.cpp	2008-05-02 11:58:14.000000000 +0200
+@@ -1175,7 +1175,7 @@ void LaunchConverter(const char * input,
  #ifndef _WIN32
      int pid=fork();
      if (!pid) {

vegastrike-0.4.2-posh-fix.patch:

Index: vegastrike-0.4.2-posh-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.2-posh-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-0.4.2-posh-fix.patch	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-0.4.2-posh-fix.patch	7 May 2008 05:30:12 -0000	1.2
@@ -1,15 +1,6 @@
 diff -urN vegastrike-0.4.2.orig/src/posh.h vegastrike-0.4.2/src/posh.h
 --- vegastrike-0.4.2.orig/src/posh.h	2003-10-23 13:51:58.000000000 -0400
 +++ vegastrike-0.4.2/src/posh.h	2004-11-22 17:40:07.000000000 -0500
-@@ -500,7 +500,7 @@
- ** Intel x86 and AMD x86-64
- ** ------------------------------------------------------------------
- */
--#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 || defined __386__ || defined FORCE_DOXYGEN
-+#if defined __X86__ || defined __i386__ || defined i386 || defined _M_IX86 || defined __386__ || defined __x86_64__ || defined FORCE_DOXYGEN
- #  define POSH_CPU_X86 /**<if defined, target CPU is Intel 386+ compatible */
- #  if defined __x86_64__ || defined FORCE_DOXYGEN
- #     define POSH_CPU_X86_64 /**<if defined, target CPU is AMD x86-64 */
 @@ -536,6 +536,17 @@
  #  endif
  #endif

vegastrike-0.4.2-vssetup-fix.patch:

Index: vegastrike-0.4.2-vssetup-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.2-vssetup-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vegastrike-0.4.2-vssetup-fix.patch	13 Apr 2008 20:27:17 -0000	1.2
+++ vegastrike-0.4.2-vssetup-fix.patch	7 May 2008 05:30:12 -0000	1.3
@@ -1,47 +1,5 @@
-diff -urN vegastrike-0.4.1.orig/vssetup/src/Makefile vegastrike-0.4.1/vssetup/src/Makefile
---- vegastrike-0.4.1.orig/vssetup/src/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ vegastrike-0.4.1/vssetup/src/Makefile	2004-01-12 13:03:12.000000000 -0500
-@@ -0,0 +1,37 @@
-+
-+CC = gcc
-+CXX = g++
-+
-+LIBS = `pkg-config gtk+-2.0 --libs`
-+RPM_OPT_FLAGS =
-+CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) `pkg-config gtk+-2.0 --cflags` -g -DGTK
-+CXXFLAGS = $(CFLAGS)
-+
-+bindir = /usr/games 
-+PROGNAME = vssetup
-+
-+INSTALL = install
-+DESTDIR =
-+
-+OBJECTS =      include/general.o \
-+               include/central.o \
-+               include/display_dialog.o \
-+               include/display_gtk.o \
-+               include/file.o \
-+               c/setup.o
-+
-+
-+
-+all: $(PROGNAME)
-+
-+$(PROGNAME):   $(OBJECTS)
-+		$(CXX) -o $@ $^ $(LIBS)
-+
-+install:
-+	$(INSTALL) -d -m 755 $(bindir)
-+	$(INSTALL) -m 755 $(PROGNAME) $(bindir)
-+
-+clean:
-+	rm -f $(PROGNAME) $(OBJECTS)
-+
-+
-diff -urN vegastrike-0.4.1.orig/vssetup/src/include/display_gtk.cpp vegastrike-0.4.1/vssetup/src/include/display_gtk.cpp
---- vegastrike-0.4.1.orig/vssetup/src/include/display_gtk.cpp	2003-09-19 17:31:02.000000000 -0400
-+++ vegastrike-0.4.1/vssetup/src/include/display_gtk.cpp	2004-01-12 13:02:19.000000000 -0500
+--- vegastrike-0.4.1.orig/setup/src/include/display_gtk.cpp	2003-09-19 17:31:02.000000000 -0400
++++ vegastrike-0.4.1/setup/src/include/display_gtk.cpp	2004-01-12 13:02:19.000000000 -0500
 @@ -56,7 +56,7 @@
  #ifdef _WIN32
  	int err=(int)ShellExecute(NULL,"open","documentation\\readme.txt","","",1);

vegastrike-0.4.3-64-bit.patch:

Index: vegastrike-0.4.3-64-bit.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.3-64-bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-0.4.3-64-bit.patch	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-0.4.3-64-bit.patch	7 May 2008 05:30:12 -0000	1.2
@@ -1,149 +1,11 @@
-diff -urN vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp
---- vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp	2004-12-18 17:32:47.000000000 +0900
-+++ vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp	2005-08-17 01:36:42.000000000 +0900
-@@ -260,12 +260,12 @@
- };
- }
- void LoopAround(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(false,true,false,(int)un);
-+	Order* broll = new Orders::LoopAround(false,true,false,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
- void AggressiveLoopAround(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(true,true,false,(int)un);
-+	Order* broll = new Orders::LoopAround(true,true,false,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
-@@ -278,22 +278,22 @@
-     AddOrd(un->aistate,un,new ExecuteFor(new Orders::MatchRoll(-un->GetComputerData().max_roll_left,false),1.0f));
- }
- void LoopAroundFast(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(false,true,true,(int)un);
-+	Order* broll = new Orders::LoopAround(false,true,true,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
- void AggressiveLoopAroundFast(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(true,true,true,(int)un);
-+	Order* broll = new Orders::LoopAround(true,true,true,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
- void LoopAroundSlow(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(false,false,false,(int)un);
-+	Order* broll = new Orders::LoopAround(false,false,false,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
- void AggressiveLoopAroundSlow(Order* aisc, Unit * un) {
--	Order* broll = new Orders::LoopAround(true,false,false,(int)un);
-+	Order* broll = new Orders::LoopAround(true,false,false,(long)un);
- 	AddOrd(aisc,un,broll);
- 	
- }
-diff -urN vegastrike-0.4.3.orig/src/cmd/music.cpp vegastrike-0.4.3/src/cmd/music.cpp
---- vegastrike-0.4.3.orig/src/cmd/music.cpp	2005-08-17 01:35:24.000000000 +0900
-+++ vegastrike-0.4.3/src/cmd/music.cpp	2005-08-17 01:36:51.000000000 +0900
-@@ -205,7 +205,7 @@
- 
- int Music::SelectTracks(void) {
-   static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
--  if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (int)playlist.size()&&lastlist>=0) {
-+  if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (long)playlist.size()&&lastlist>=0) {
-     if (loopsleft>0) {
-       loopsleft--;
-     }
-@@ -259,7 +259,7 @@
-   if (!playlist[BATTLELIST].empty()) {
-     tmp=randInt((playlist[BATTLELIST].size()));
-   }
--  return (int)tmp;
-+  return (long)tmp;
- }
- volatile int moredata=0;
- #ifndef _WIN32
-@@ -274,7 +274,7 @@
- 			  void * 
- #endif		  
- 			  input) {
--	int socketr = (int)input;
-+	int socketr = (long)input;
- 	while(1) {
-           printf ("Reading from socket %d\n",socketr);
-           char data=fNET_fgetc(socketr);
-@@ -333,7 +333,7 @@
- 
- void Music::GotoSong (int whichlist,int whichsong,bool skip) {
- 	if (g_game.music_enabled) {
--		if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(int)playlist.size()&&whichsong<(int)playlist[whichlist].size()) {
-+		if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(long)playlist.size()&&whichsong<(long)playlist[whichlist].size()) {
- 			GotoSong(playlist[whichlist][whichsong]);
- 		} else {
- 			SkipRandList();
-@@ -343,7 +343,7 @@
- 
- void Music::SkipRandSong(int whichlist) {
- 	if (this!=NULL) {
--	  if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(int)playlist.size()){
-+	  if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(long)playlist.size()){
- 	    lastlist = whichlist;
-             static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
-             if (playlist[whichlist].size()) {
-diff -urN vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp vegastrike-0.4.3/src/cmd/script/pythonmission.cpp
---- vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp	2004-04-25 09:39:13.000000000 +0900
-+++ vegastrike-0.4.3/src/cmd/script/pythonmission.cpp	2005-08-17 01:36:47.000000000 +0900
-@@ -16,7 +16,7 @@
- 	delete this;
- }
- PythonMissionBaseClass::~PythonMissionBaseClass(){
--	VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%x)",(unsigned long)this,(unsigned int)this);
-+	VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%lx)",(unsigned long)this,(unsigned long)this);
- }
- 
- void PythonMissionBaseClass::Execute () {
-diff -urN vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp vegastrike-0.4.3/src/cmd/unit_generic.cpp
---- vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp	2005-02-10 13:18:56.000000000 +0900
-+++ vegastrike-0.4.3/src/cmd/unit_generic.cpp	2005-08-17 01:36:49.000000000 +0900
-@@ -119,7 +119,7 @@
- 		  }
- 		  diff = fmod (diff,tmpflicker);
- 		  //we know counter is somewhere between 0 and damage level
--		  unsigned int thus = ((int)un)>>2;//cast this to an int for fun!
-+		  unsigned int thus = ((long)un)>>2;//cast this to an int for fun! (this doesn't work for 64-bit machines)
- 		  thus = thus % ((unsigned int)tmpflicker);
- 		  diff = fmod (diff+thus,tmpflicker);
- 		  if (flickerofftime>diff) {
-diff -urN vegastrike-0.4.3.orig/src/gui/eventmanager.cpp vegastrike-0.4.3/src/gui/eventmanager.cpp
---- vegastrike-0.4.3.orig/src/gui/eventmanager.cpp	2004-12-17 19:10:41.000000000 +0900
-+++ vegastrike-0.4.3/src/gui/eventmanager.cpp	2005-08-17 01:36:52.000000000 +0900
-@@ -61,7 +61,7 @@
- 	if (controlToDelete == NULL || find(deleteQueue.begin(), deleteQueue.end(), controlToDelete)!=deleteQueue.end()) {
- 		bool DUPLICATE_DELETE_OF_OBJECT = true;
- 		char tempstr[254];
--		sprintf(tempstr, "\nERROR: duplicate delete of object %X.\n\n", (int)controlToDelete);
-+		sprintf(tempstr, "\nERROR: duplicate delete of object %lX.\n\n", (long)controlToDelete);
- 		fputs(tempstr, stderr);
- #if defined (_MSC_VER) && defined(_DEBUG) && 0
- 		if (DEBUG_ERROR_IN_MY_CODE) {
 --- vegastrike-0.4.3/launcher/saveinterface.cpp~	2006-02-10 10:54:30.000000000 +0100
 +++ vegastrike-0.4.3/launcher/saveinterface.cpp	2006-02-10 11:11:33.000000000 +0100
 @@ -213,7 +213,7 @@
  #ifdef _WIN32
    GoToParentDir();
  #endif
--  unsigned int player = my_mission.rfind ("player");
+-  int player = my_mission.rfind ("player");
 +  std::string::size_type player = my_mission.rfind ("player");
    if (player>0&&player!=std::string::npos) {
     char  num [4]={'-','m',(*(my_mission.begin()+(player-1))),'\0'};
     printf ("vegastrike %s %s",num,my_mission.c_str());
-@@ -298,7 +298,7 @@
- }
- 
- void hello( GtkWidget *widget, gpointer   data ) {
--    int i=(int)data;
-+    int i=GPOINTER_TO_INT(data);
-     int pid=0;
-     switch (i) {
-     case 5:

vegastrike-0.4.3-openal.patch:

Index: vegastrike-0.4.3-openal.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.3-openal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-0.4.3-openal.patch	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-0.4.3-openal.patch	7 May 2008 05:30:12 -0000	1.2
@@ -13,23 +13,3 @@
  bool AUDInit () {
    g_game.sound_enabled = false;
  #ifdef HAVE_AL
---- vegastrike-0.4.3/configure.in.openal	2007-02-25 16:17:45.000000000 +0100
-+++ vegastrike-0.4.3/configure.in	2007-02-25 16:35:10.000000000 +0100
-@@ -1151,7 +1151,7 @@
-     if test "x$have_openal_lib" = "xyes" ; then
-       EPEE_DAY="september 30"
-     else
--      MACORPCLIBS="$OPENAL_LDOPTS -l$OPENAL_LIB_NAME"
-+      MACORPCLIBS="$OPENAL_LDOPTS -l$OPENAL_LIB_NAME -lalut"
-       CHECK_FOR_OPENAL_LIB
-     fi
- 
-@@ -1261,7 +1261,7 @@
- 	   CPPFLAGS="$saved_CPPFLAGS $VORBIS_CFLAGS"
- 	   AC_MSG_CHECKING([for vorbis header])
- 	   AC_TRY_CPP([#include <vorbis/vorbisfile.h> ] ,have_vorbis_h=yes , have_vorbis_h=no)
--	   AC_MSG_RESULT([$have_vorbis_h])]
-+	   AC_MSG_RESULT([$have_vorbis_h])
- 	   if test "x$have_vorbis_h" = "xyes" ; then
- 	      VS_CPPFLAGS="${VS_CPPFLAGS} ${VORBIS_CFLAGS} -DHAVE_OGG "
- 	      echo "found VORBIS header: Enabling ingame ogg support:: ${VS_CPPFLAGS}"

vegastrike-0.4.3-sys-python.patch:

Index: vegastrike-0.4.3-sys-python.patch
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-0.4.3-sys-python.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike-0.4.3-sys-python.patch	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike-0.4.3-sys-python.patch	7 May 2008 05:30:12 -0000	1.2
@@ -1,14 +1,14 @@
---- vegastrike-0.4.3/src/python/init.cpp~	2007-04-23 20:30:02.000000000 +0200
-+++ vegastrike-0.4.3/src/python/init.cpp	2007-04-23 20:30:02.000000000 +0200
-@@ -226,7 +226,6 @@
+--- vegastrike-source-0.5.0/src/python/init.cpp.orig	2008-04-26 12:00:00.000000000 +0200
++++ vegastrike-source-0.5.0/src/python/init.cpp	2008-05-02 13:09:08.000000000 +0200
+@@ -235,7 +235,6 @@ void Python::initpaths(){
    // Find all the mods dir (ignore homedir)
    for( int i=1; i<VSFileSystem::Rootdir.size(); i++)
    {
--	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/modules/builtin/\",";
- 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/"+moduledir+"/\",";
- 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+"/"+basesdir+"/\"";
+-	  modpaths += "r\""+VSFileSystem::Rootdir[i]+ PATHSEP +moduledir+ PATHSEP "builtin\",";
+ 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+ PATHSEP +moduledir+"\",";
+ 	  modpaths += "r\""+VSFileSystem::Rootdir[i]+ PATHSEP +basesdir+"\"";
  	  if( i+1<VSFileSystem::Rootdir.size())
-@@ -237,7 +236,7 @@
+@@ -246,7 +245,7 @@ void Python::initpaths(){
    while ((backslash=modpaths.find("\\"))!=std::string::npos) {
       modpaths[backslash]='/';
       }*/


Index: vegastrike-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike-wrapper.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vegastrike-wrapper.sh	24 Sep 2007 20:23:55 -0000	1.2
+++ vegastrike-wrapper.sh	7 May 2008 05:30:12 -0000	1.3
@@ -16,4 +16,4 @@
   cp $VSDATADIR/vegastrike.config .
   vssetup
 fi
-exec vslauncher "$@"
+exec vegastrike "$@" > log 2>&1


Index: vegastrike.desktop
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vegastrike.desktop	10 May 2007 19:18:00 -0000	1.1
+++ vegastrike.desktop	7 May 2008 05:30:12 -0000	1.2
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Vega Strike
 Comment=3D OpenGL spaceflight simulator
 Exec=vegastrike-wrapper.sh
-Icon=vegastrike.png
+Icon=vegastrike
 Terminal=false
 Type=Application
 Categories=Game;Simulation;


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vegastrike.spec	13 Apr 2008 20:27:18 -0000	1.9
+++ vegastrike.spec	7 May 2008 05:30:12 -0000	1.10
@@ -1,56 +1,27 @@
 Name:           vegastrike
-Version:        0.4.3
-Release:        9%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://vegastrike.sourceforge.net/
-# sigh no tarballs from upstream why o why? Created by doing the following:
-# cvs -z9 \
-#   -d:pserver:anonymous at vegastrike.cvs.sourceforge.net:/cvsroot/vegastrike \
-#   checkout -rvegastrike_0_4_3 vegastrike
-# mv vegastrike vegastrike-0.4.3
-# pushd vegastrike-0.4.3
-# rm -fr vc98 src/boost* English.lproj VegaStrikeOSX*
-# rm -fr `find -name CVS`
-# popd
-# tar cvfj vegastrike-0.4.3.tar.bz2 vegastrike-0.4.3
-Source0:        %{name}-%{version}.tar.bz2
-# Found in the mandrive srpm, origin ??
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
+# Found in the mandriva srpm, origin Debian ?
 Source1:        %{name}-manpages.tar.bz2
-# and again no tarbal, this is created by doing the following:
-# cvs -z9 \
-#   -d:pserver:anonymous at vegastrike.cvs.sourceforge.net:/cvsroot/vegastrike \
-#   checkout vssetup
-# rm -fr `find vssetup -name CVS`
-# tar cvfj vssetup.tar.bz2 vssetup
-Source2:        vssetup.tar.bz2
+Source2:        %{name}-wrapper.sh
 Source3:        %{name}.desktop
-Source4:        %{name}-32x32.png
-Source5:        %{name}-48x48.png
-Source6:        %{name}-wrapper.sh
 Patch0:         vegastrike-0.4.2-char-fix.patch
-Patch2:         vegastrike-0.4.2-launcher-fix.patch
-# not applied as no longer needed, kept for reference
-Patch4:         vegastrike-0.4.2-opengl-fix.patch
-Patch5:         vegastrike-0.4.2-paths-fix.patch
-Patch6:         vegastrike-0.4.2-posh-fix.patch
-Patch7:         vegastrike-0.4.3-alut-fixes.patch
-Patch8:         vegastrike-0.4.3-gcc4-fix.patch
-Patch9:         vegastrike-0.4.3-64-bit.patch
-Patch10:        vegastrike-0.4.3-gtk2.patch
-Patch11:        vegastrike-0.4.2-vssetup-fix.patch
-Patch12:        vegastrike-0.4.3-gcc41-fix.patch
-Patch13:        vegastrike-0.4.3-use-system-boost.patch
-Patch14:        vegastrike-0.4.3-openal.patch
-Patch15:        vegastrike-0.4.3-sys-python.patch
-Patch16:        vegastrike-0.4.3-ppc.patch
-Patch17:        vegastrike-0.4.3-gcc43.patch
+Patch1:         vegastrike-0.4.2-paths-fix.patch
+Patch2:         vegastrike-0.4.2-posh-fix.patch
+Patch3:         vegastrike-0.4.2-vssetup-fix.patch
+Patch4:         vegastrike-0.4.3-64-bit.patch
+Patch5:         vegastrike-0.4.3-openal.patch
+Patch6:         vegastrike-0.4.3-sys-python.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
 BuildRequires:  SDL_mixer-devel openal-devel freealut-devel libvorbis-devel
-BuildRequires:  automake desktop-file-utils
+BuildRequires:  ogre-devel cegui-devel desktop-file-utils
 Requires:       %{name}-data = %{version}, hicolor-icon-theme, xdg-utils
 Requires:       opengl-games-utils
 
@@ -62,52 +33,41 @@
 
 
 %prep
-%setup -q -a1 -a2
-%patch0 -p1 -b .char
-%patch2 -p1 -b .launcher
-%patch5 -p1 -b .paths
-%patch6 -p1 -b .posh
-%patch7 -p1 -b .alut
-%patch8 -p1 -b .gcc4
-%patch9 -p1 -b .64-bit
-%patch10 -p1 -b .gtk2
-%patch11 -p1 -b .vssetup
-%patch12 -p1 -b .gcc41
-%patch13 -p1 -b .boost
-%patch14 -p1 -b .openal
-%patch15 -p1 -b .sys-py
-%patch16 -p1 -b .ppc
-%patch17 -p1 -b .gcc43
-chmod -x `find src -type f`
-sed -i 's|lib/python|%{_lib}/python|g' configure.in
-sed -i 's/\r//g' README
+%setup -q -a 1 -n %{name}-source-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
+touch -r README README.tmp
+mv README.tmp README
+sed -i 's/-lboost_python-st/-lboost_python/g' Makefile.in
 # we want to use the system version of expat.h
 rm objconv/mesher/expat.h
-autoreconf -i
 
 
 %build
-pushd vssetup/src
-  make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-popd
-%configure --with-data-dir=%{_datadir}/%{name} --enable-release \
-  --enable-flags="$RPM_OPT_FLAGS" 
+%configure --with-data-dir=%{_datadir}/%{name} --with-boost=system \
+  --enable-release --enable-flags="$RPM_OPT_FLAGS" --disable-ffmpeg \
+  --enable-stencil-buffer
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Note: make install PREFIX=$RPM_BUILD_ROOT doesnot work :(
-pushd vssetup/src
-  %makeinstall
-popd
-
+#make install PREFIX=$RPM_BUILD_ROOT doesn't work
 %makeinstall
-install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-for i in accountserver asteroidgen mesher replace trisort vegaserver \
-         vsrextract vsrmake soundserver; do
+chmod +x $RPM_BUILD_ROOT%{_prefix}/objconv/*
+mv $RPM_BUILD_ROOT%{_prefix}/objconv/* \
+  $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+for i in asteroidgen base_maker mesh_xml mesher replace tempgen trisort \
+         vsrextract vsrmake; do
   mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 done
 
@@ -119,43 +79,26 @@
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 %{SOURCE4} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 %{SOURCE5} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING DOCUMENTATION README ToDo.txt
-%{_bindir}/%{name}*
+%{_bindir}/vega*
 %{_bindir}/vs*
 %{_libexecdir}/%{name}
 %{_mandir}/man6/*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Sat May  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
+- New upstream release 0.5.0
+
 * Sun Apr 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-9
 - Use xdg-open instead of gedit to show the user the readme (bz 442063)
 


--- vegastrike-0.4.2-launcher-fix.patch DELETED ---


--- vegastrike-0.4.2-opengl-fix.patch DELETED ---


--- vegastrike-0.4.3-alut-fixes.patch DELETED ---


--- vegastrike-0.4.3-ppc.patch DELETED ---


--- vegastrike-0.4.3-use-system-boost.patch DELETED ---


