rpms/blobAndConquer/F-7 blobAndConquer-0.90-exit-crash.patch, 1.2, 1.3 blobAndConquer.spec, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7691

Modified Files:
	blobAndConquer-0.90-exit-crash.patch blobAndConquer.spec 
Log Message:
* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-5
- Fix restoring of resolution when exiting a fullscreen game


blobAndConquer-0.90-exit-crash.patch:

Index: blobAndConquer-0.90-exit-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/F-7/blobAndConquer-0.90-exit-crash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blobAndConquer-0.90-exit-crash.patch	3 Jun 2007 14:21:42 -0000	1.2
+++ blobAndConquer-0.90-exit-crash.patch	31 Dec 2007 14:37:05 -0000	1.3
@@ -1,12 +1,20 @@
---- blobAndConquer-0.90/src/init.cpp~	2007-05-23 22:40:47.000000000 +0200
-+++ blobAndConquer-0.90/src/init.cpp	2007-05-23 22:40:47.000000000 +0200
-@@ -506,8 +506,9 @@
+diff -up blobAndConquer-0.91/src/init.cpp.exit blobAndConquer-0.91/src/init.cpp
+--- blobAndConquer-0.91/src/init.cpp.exit	2007-12-31 15:26:48.000000000 +0100
++++ blobAndConquer-0.91/src/init.cpp	2007-12-31 12:26:48.000000000 +0100
+@@ -496,8 +496,15 @@ void cleanup()
+ 		debug(("Closing Joystick %s...\n", SDL_JoystickName(0)));
  		SDL_JoystickClose(engine->joystick);
  	}
++
++/*	Disable SDL_Quit as it causes us to segfault on exit (at_exit that is)
++	call SDL_WM_ToggleFullScreen() instead to restore desktop resolution
++	if needed, and ungrab the mouse if needed. */
++	/* SDL_Quit(); */
++	if (graphics->fullscreen)
++		SDL_WM_ToggleFullScreen(graphics->screen);
  	
-+/*	Disable this it causes us to segfault on exit (at_exit that is)
 -	SDL_Quit();
-+	SDL_Quit(); */
++	SDL_WM_GrabInput(SDL_GRAB_OFF);
  
  	debug(("All Done.\n"));
  }


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/F-7/blobAndConquer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blobAndConquer.spec	3 Jun 2007 14:21:42 -0000	1.2
+++ blobAndConquer.spec	31 Dec 2007 14:37:05 -0000	1.3
@@ -7,10 +7,10 @@
 
 Name:           blobAndConquer
 Version:        0.91
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.parallelrealities.co.uk/blobAndConquer.php
 # Non rpm compatible URL: http://www.parallelrealities.co.uk/download.php?file=blobAndConquer-%{version}-%{upstream_release}.tar.gz&type=zip
 Source0:        %{name}-%{version}-%{upstream_release}.tar.gz
@@ -19,7 +19,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
+Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
 With the apparent defeat of Galdov and the reclaiming of the Fire, Time, Space
@@ -39,6 +39,8 @@
 # some cleanup
 chmod -x gfx/rw2/*.raw data/gameDefs/defines.h `find src -type f`
 sed -i 's/\r//g' data/gameDefs/defines.h `find src -type f`
+sed -i 's/Exec=blobAndConquer/Exec=blobAndConquer-wrapper/' \
+  icons/blobAndConquer.desktop
 
 
 %build
@@ -56,11 +58,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=$RPM_BUILD_ROOT%{_bindir} \
   DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
   ICONDIR=$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 mkdir installed-docs
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category ActionGame \
+  --remove-key Version \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -70,17 +75,21 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_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 || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_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 installed-docs/*
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 # the data/gameDefs/defines.h file is needed runtime and thus not a devel file!
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -88,6 +97,19 @@
 
 
 %changelog
+* Mon Dec 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-5
+- Fix restoring of resolution when exiting a fullscreen game
+
+* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-4
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
+* Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-3
+- Rebuild for buildId
+
+* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-2
+- Update License tag for new Licensing Guidelines compliance
+- Fix invalid desktop file (fix building with latest desktop-file-utils)
+
 * Sun Jun  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-1
 - New upstream release 0.91-1
 - Drop upstreamed patches