rpms/blobAndConquer/devel blobAndConquer-1.0-defines.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 blobAndConquer.spec, 1.18, 1.19 sources, 1.11, 1.12

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825

Modified Files:
	.cvsignore blobAndConquer.spec sources 
Added Files:
	blobAndConquer-1.0-defines.patch 
Log Message:
* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 1.0-1
- New upstream release 1.0


blobAndConquer-1.0-defines.patch:

--- NEW FILE blobAndConquer-1.0-defines.patch ---
diff -up blobAndConquer-1.0/data/gameDefs/defines.h~ blobAndConquer-1.0/data/gameDefs/defines.h
--- blobAndConquer-1.0/data/gameDefs/defines.h~	2008-09-28 20:10:53.000000000 +0200
+++ blobAndConquer-1.0/data/gameDefs/defines.h	2008-09-28 20:10:53.000000000 +0200
@@ -377,7 +377,7 @@ enum {
 	SND_GALDOV_CHARGE,
 	SND_GALDOV_FIRE,
 	SND_PLANT_BOMB,
-	SND_POP
+        SND_POP
 };
 
 /* ############### weapons ############ */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Sep 2008 12:44:05 -0000	1.11
+++ .cvsignore	30 Sep 2008 08:13:56 -0000	1.12
@@ -1,2 +1,2 @@
-blobAndConquer-0.98.tar.gz
-blobAndConquer-0.98-music.tar.bz2
+blobAndConquer-1.0.tar.gz
+blobAndConquer-1.0-music.tar.bz2


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/blobAndConquer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blobAndConquer.spec	17 Sep 2008 12:44:05 -0000	1.18
+++ blobAndConquer.spec	30 Sep 2008 08:13:56 -0000	1.19
@@ -6,8 +6,8 @@
 %define upstream_release 1
 
 Name:           blobAndConquer
-Version:        0.98
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+ and Redistributable, no modification permitted
@@ -16,6 +16,7 @@
 #Tarball without nonfree sound file
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-music.tar.bz2
+Patch0:         %{name}-1.0-defines.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
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 # 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`
@@ -41,7 +43,6 @@
   icons/blobAndConquer.desktop
 sed -i 's/-o root -g games//g' makefile
 
-cp -p *.{xm,s3m,mod} music/
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" DOCDIR=%{_docdir}/%{name}-%{version}/ \
@@ -93,8 +94,12 @@
 
 
 %changelog
+* Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 1.0-1
+- New upstream release 1.0
+
 * Wed Sep 17 2008 Rafał Psota <rafalzaq at gmail.com> 0.98-2
 - Remove nonfree sound files
+
 * Wed Jul  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.98-1
 - New upstream release 0.98
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Sep 2008 12:44:05 -0000	1.11
+++ sources	30 Sep 2008 08:13:56 -0000	1.12
@@ -1,2 +1,2 @@
-71a3726c15f0c5f9ed2c6910ef5a721e  blobAndConquer-0.98.tar.gz
-121f85f5a039d2a3fd1d6d3262c5137a  blobAndConquer-0.98-music.tar.bz2
+4e627e84e0c0f5da7599ddf5596f1404  blobAndConquer-1.0.tar.gz
+855639ce503f8e37338ce25b3b641931  blobAndConquer-1.0-music.tar.bz2