rpms/blobAndConquer/F-10 blobAndConquer-1.0-64bit.patch, NONE, 1.1 blobAndConquer.spec, 1.19, 1.20

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/blobAndConquer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18037

Modified Files:
	blobAndConquer.spec 
Added Files:
	blobAndConquer-1.0-64bit.patch 
Log Message:
* Tue Mar 31 2009 Hans de Goede <hdegoede at redhat.com> 1.0-3
- Fix blobAndConquer not starting on 64 bit machines


blobAndConquer-1.0-64bit.patch:

--- NEW FILE blobAndConquer-1.0-64bit.patch ---
diff -up blobAndConquer-1.0/src/cplusplus/CPak.cpp.orig blobAndConquer-1.0/src/cplusplus/CPak.cpp
--- blobAndConquer-1.0/src/cplusplus/CPak.cpp.orig	2008-06-21 15:00:34.000000000 +0200
+++ blobAndConquer-1.0/src/cplusplus/CPak.cpp	2009-03-31 16:01:35.000000000 +0200
@@ -76,7 +76,7 @@ void Pak::showPakErrorAndExit()
 
 void Pak::initPakFile()
 {
-	uLongf listPos;
+	int listPos;
 
 	debug(("Pak : Filename set to %s\n", PAKFULLPATH));
 


Index: blobAndConquer.spec
===================================================================
RCS file: /cvs/extras/rpms/blobAndConquer/F-10/blobAndConquer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- blobAndConquer.spec	30 Sep 2008 08:13:56 -0000	1.19
+++ blobAndConquer.spec	31 Mar 2009 17:04:26 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:           blobAndConquer
 Version:        1.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Blob Wars 2: Blob And Conquer
 Group:          Amusements/Games
 License:        GPLv2+ and Redistributable, no modification permitted
@@ -17,6 +17,7 @@
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-music.tar.bz2
 Patch0:         %{name}-1.0-defines.patch
+Patch1:         %{name}-1.0-64bit.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
@@ -36,6 +37,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -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`
@@ -94,6 +96,12 @@
 
 
 %changelog
+* Tue Mar 31 2009 Hans de Goede <hdegoede at redhat.com> 1.0-3
+- Fix blobAndConquer not starting on 64 bit machines
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Sep 30 2008 Hans de Goede <hdegoede at redhat.com> 1.0-1
 - New upstream release 1.0