rpms/scorched3d/devel scorched3d-help.patch, NONE, 1.1 scorched3d-openal.patch, NONE, 1.1 scorched3d.spec, 1.7, 1.8

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon Feb 6 15:01:40 UTC 2006


Author: jwrdegoede

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

Modified Files:
	scorched3d.spec 
Added Files:
	scorched3d-help.patch scorched3d-openal.patch 
Log Message:
scorched3d WIP

scorched3d-help.patch:

--- NEW FILE scorched3d-help.patch ---
--- scorched/src/scorched/MainDialog.cpp.help	2006-02-06 12:24:58.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-06 12:25:42.000000000 +0100
@@ -131,7 +131,7 @@
 #ifdef __DARWIN__
 	system(formatString("open %s", url));
 #else
-	system(formatString("mozilla %s", url));
+	system(formatString("htmlview %s&", url));
 	dialogMessage("Web site location", "%s", url);
 #endif // __DARWIN__
 #endif // _WIN32

scorched3d-openal.patch:

--- NEW FILE scorched3d-openal.patch ---
--- scorched/configure.ac.openal	2006-02-06 10:55:19.000000000 +0100
+++ scorched/configure.ac	2006-02-06 10:55:31.000000000 +0100
@@ -114,7 +114,7 @@
 	if test x"$use_static_openal" = x"yes"; then
 		LIBS="$LIBS /usr/local/lib/libopenal.a"
 	else
-		LIBS="$LIBS `$OPENAL_CONFIG --libs`"
+		LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut"
 	fi
 	
 	CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scorched3d.spec	5 Feb 2006 21:58:44 -0000	1.7
+++ scorched3d.spec	6 Feb 2006 15:01:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        39.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
@@ -14,6 +14,8 @@
 Patch2:         %{name}-aclocal18.patch
 Patch3:         %{name}-gcc41.patch
 Patch4:         %{name}-64bit.patch
+Patch5:         %{name}-openal.patch
+Patch6:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -54,13 +56,13 @@
 %patch2 -p0 -z .aclocal18
 %patch3 -p1 -z .gcc41
 %patch4 -p0 -z .64bit
+%patch5 -p1 -z .openal
+%patch6 -p1 -z .help
 tar xvfz %{SOURCE2}
 . autogen.sh
 
 
 %build
-#we need to add -lalut, which in turn needs -lopenal otherwise configure fails
-export LDFLAGS="-lalut -lopenal -lpthread"
 %configure \
   --disable-dependency-tracking \
   --datadir=%{_datadir}/games/%{name} \
@@ -106,6 +108,15 @@
 
 
 %changelog
+* Mon Feb  6 2006 <j.w.r.degoede at hhs.nl> 39.1-2
+- upgrade to CVS snapshot of 20050929, as Debian does, this fixes a few
+  internetplay bugs and allows compilation with wxGTK 2.6
+- fix gcc41 compilation
+- fix 64 bit compilation (courtesy debian-ppc-64)
+- fix compile with openal-0.9
+- use htmlview for helpfile viewing instead of hardcoded mozilla,
+  run this in background so the game doesn't freeze
+
 * Sat Oct  8 2005 Ville Skyttä <ville.skytta at iki.fi> - 39.1-1
 - 39.1.
 - Avoid aclocal >= 1.8 warnings.




More information about the scm-commits mailing list