rpms/blobAndConquer/FC-6 .cvsignore, 1.2, 1.3 blobAndConquer-0.90-exit-crash.patch, 1.1, 1.2 blobAndConquer.spec, 1.1, 1.2 sources, 1.2, 1.3 blobAndConquer-0.90-no-stencil.patch, 1.1, NONE blobAndConquer-0.90-opt-fix.patch, 1.1, NONE blobAndConquer-0.90-strict-alias.patch, 1.1, NONE blobAndConquer-0.90-unix-lf.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13683

Modified Files:
	.cvsignore blobAndConquer-0.90-exit-crash.patch 
	blobAndConquer.spec sources 
Removed Files:
	blobAndConquer-0.90-no-stencil.patch 
	blobAndConquer-0.90-opt-fix.patch 
	blobAndConquer-0.90-strict-alias.patch 
	blobAndConquer-0.90-unix-lf.patch 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 May 2007 10:40:17 -0000	1.2
+++ .cvsignore	3 Jun 2007 14:46:34 -0000	1.3
@@ -1 +1 @@
-blobAndConquer-0.90-1.tar.gz
+blobAndConquer-0.91-1.tar.gz

blobAndConquer-0.90-exit-crash.patch:

Index: blobAndConquer-0.90-exit-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/FC-6/blobAndConquer-0.90-exit-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blobAndConquer-0.90-exit-crash.patch	26 May 2007 10:40:17 -0000	1.1
+++ blobAndConquer-0.90-exit-crash.patch	3 Jun 2007 14:46:34 -0000	1.2
@@ -3,11 +3,10 @@
 @@ -506,8 +506,9 @@
  		SDL_JoystickClose(engine->joystick);
  	}
- 
+ 	
 +/*	Disable this it causes us to segfault on exit (at_exit that is)
- 	debug(("Closing SDL Sub System...\n"));
 -	SDL_Quit();
 +	SDL_Quit(); */
  
- 	debug(("All Done.\n"));m
+ 	debug(("All Done.\n"));
  }


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/FC-6/blobAndConquer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blobAndConquer.spec	26 May 2007 10:40:17 -0000	1.1
+++ blobAndConquer.spec	3 Jun 2007 14:46:34 -0000	1.2
@@ -6,20 +6,16 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.90
-Release:        2%{?dist}
+Version:        0.91
+Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPL
 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
-Patch0:         blobAndConquer-0.90-no-stencil.patch
-Patch1:         blobAndConquer-0.90-opt-fix.patch
-Patch2:         blobAndConquer-0.90-strict-alias.patch
-Patch3:         blobAndConquer-0.90-unix-lf.patch
-Patch4:         blobAndConquer-0.90-exit-crash.patch
-Patch5:         blobAndConquer-0.90-ppc.patch
+Patch0:         blobAndConquer-0.90-exit-crash.patch
+Patch1:         blobAndConquer-0.90-ppc.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_ttf-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -38,12 +34,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -z .stencil
-%patch1 -p1 -z .opt
-%patch2 -p1 -z .strict-alias
-%patch3 -p1 -z .unix-lf
-%patch4 -p1 -z .exit
-%patch5 -p1 -z .ppc
+%patch0 -p1 -z .exit
+%patch1 -p1 -z .ppc
 # 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`
@@ -64,7 +56,8 @@
 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
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/doc installed-docs
+mkdir installed-docs
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* installed-docs
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -95,6 +88,10 @@
 
 
 %changelog
+* 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
+
 * Thu May 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.90-2
 - Add missing desktop-file-utils BuildRequire
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2007 10:40:17 -0000	1.2
+++ sources	3 Jun 2007 14:46:34 -0000	1.3
@@ -1 +1 @@
-1be4fe4b85ce27868d616c6c10967334  blobAndConquer-0.90-1.tar.gz
+b96c6bb80b0be8f46df2af3c1a716e86  blobAndConquer-0.91-1.tar.gz


--- blobAndConquer-0.90-no-stencil.patch DELETED ---


--- blobAndConquer-0.90-opt-fix.patch DELETED ---


--- blobAndConquer-0.90-strict-alias.patch DELETED ---


--- blobAndConquer-0.90-unix-lf.patch DELETED ---