rpms/astromenace/devel astromenace-programmdir.patch, NONE, 1.1 astromenace.desktop, 1.2, 1.3 astromenace.spec, 1.3, 1.4

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/astromenace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15598

Modified Files:
	astromenace.desktop astromenace.spec 
Added Files:
	astromenace-programmdir.patch 
Log Message:
Added patch to set default data path, BZ 393751.


astromenace-programmdir.patch:

--- NEW FILE astromenace-programmdir.patch ---
--- AstroMenaceSource/Main.cpp	2007-12-11 07:53:07.000000000 -0600
+++ AstroMenaceSource/Main.cpp	2007-12-11 07:53:07.000000000 -0600
@@ -329,11 +329,12 @@
 	}
 	if (!dirpresent)
 	{
-		strcpy(ProgrammDir, argv[0]);
-		char* s = strrchr(ProgrammDir,'/');
-		if (s) s[0]=0x0;
-		const char *Fi = "/";
-		strcat( ProgrammDir, Fi );
+		strncat(ProgrammDir, "/usr/share/astromenace/", strlen("/usr/share/astromenace/"));
+		//strcpy(ProgrammDir, argv[0]);
+		//char* s = strrchr(ProgrammDir,'/');
+		//if (s) s[0]=0x0;
+		//const char *Fi = "/";
+		//strcat( ProgrammDir, Fi );
 	}
 
 


Index: astromenace.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/devel/astromenace.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- astromenace.desktop	7 Dec 2007 15:06:22 -0000	1.2
+++ astromenace.desktop	12 Dec 2007 12:49:48 -0000	1.3
@@ -2,7 +2,7 @@
 Type=Application
 Encoding=UTF-8
 Name=Astromenace
-Exec=astromenace-wrapper --noAA --dir=/usr/share/astromenace
+Exec=astromenace-wrapper --noAA
 Comment=3D space shooter
 Icon=astromenace.png
 Terminal=false


Index: astromenace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/devel/astromenace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- astromenace.spec	7 Dec 2007 19:40:55 -0000	1.3
+++ astromenace.spec	12 Dec 2007 12:49:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name: astromenace
 Version:  1.2
-Release:  5%{?dist}
+Release:  6%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
@@ -12,6 +12,7 @@
 Patch0: astromenace-langvfs.patch
 Patch1: astromenace-640x480.patch
 Patch2: astromenace-stuckmouse.patch
+Patch3: astromenace-programmdir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 BuildRequires: cmake, SDL-devel, openal-devel, freealut-devel, libogg-devel
@@ -40,6 +41,7 @@
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 %build
 cmake .
@@ -85,6 +87,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 
 %changelog
+* Tue Dec 11 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-6
+- Added patch to set default data path, BZ 393751.
+
 * Fri Dec 07 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-5
 - Added patch to fix stuck mouse, BZ 327671.