rpms/cylindrix/F-9 cylindrix-1.0-object-fopen.patch, NONE, 1.1 cylindrix-level10.dat, NONE, 1.1 cylindrix.sh, 1.1, 1.2 cylindrix.spec, 1.1, 1.2

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/cylindrix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559

Modified Files:
	cylindrix.sh cylindrix.spec 
Added Files:
	cylindrix-1.0-object-fopen.patch cylindrix-level10.dat 
Log Message:
Fix for broken data.


cylindrix-1.0-object-fopen.patch:

--- NEW FILE cylindrix-1.0-object-fopen.patch ---
--- object.c	2008-11-26 10:29:49.000000000 -0600
+++ object.c	2008-11-26 10:29:49.000000000 -0600
@@ -1077,7 +1077,7 @@
 
     /* open up the file */
 
-    if( (fp = fopen( newfilename, "r" )) <= 0 ) {
+    if( (fp = fopen( newfilename, "r" )) == NULL ) {
 	printf("get_object(): Invalid filname '%s'!\n", newfilename);
 	Kill_Keys();
 	exit(1);


--- NEW FILE cylindrix-level10.dat ---
gamedata/level10.pyl
 &

Index: cylindrix.sh
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/F-9/cylindrix.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cylindrix.sh	17 Jun 2008 12:46:50 -0000	1.1
+++ cylindrix.sh	13 Feb 2009 16:48:17 -0000	1.2
@@ -18,5 +18,11 @@
   cp -pr /usr/share/cylindrix/gamedata ~/.cylindrix/ || :
 fi
 
+if [ ! -a ~/.cylindrix/bz452190 ]; then
+  #refresh gamedata/level10.dat
+  cp -pf /usr/share/cylindrix/gamedata/level10.dat ~/.cylindrix/gamedata/level10.dat || :
+  echo "Correction for broken data file" > ~/.cylindrix/bz452190 || :
+fi
+
 cd ~/.cylindrix
 exec cylindrix-bin "$@"


Index: cylindrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/F-9/cylindrix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cylindrix.spec	17 Jun 2008 12:46:50 -0000	1.1
+++ cylindrix.spec	13 Feb 2009 16:48:17 -0000	1.2
@@ -1,7 +1,7 @@
 Name: cylindrix
 Version:  1.0
-Release: 4%{?dist}
-Summary: Cylindrix is a 3 degrees of freedom combat game
+Release: 8%{?dist}
+Summary: A 3 degrees of freedom combat game
 
 Group: Amusements/Games 
 License: LGPLv2        
@@ -10,10 +10,12 @@
 Source1: cylindrix.desktop
 Source2: cylindrix.png
 Source3: cylindrix.sh
+Source4: cylindrix-level10.dat
 Patch0: cylindrix-1.0-fix-packing.patch
 Patch1: cylindrix-1.0-arch-independ-file-read.patch
 Patch2: cylindrix-1.0-use-int-not-long.patch
 Patch3: cylindrix-1.0-arch-independ-file-write.patch
+Patch4: cylindrix-1.0-object-fopen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: hicolor-icon-theme
 BuildRequires: allegro-devel, desktop-file-utils
@@ -39,6 +41,7 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %build
 
@@ -67,6 +70,9 @@
 cp -pr stats %{buildroot}%{_datadir}/cylindrix
 cp -pr wav_data %{buildroot}%{_datadir}/cylindrix
 
+#replace broken data file
+rm -f %{buildroot}%{_datadir}/cylindrix/gamedata/level10.dat
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/cylindrix/gamedata/level10.dat
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -104,6 +110,18 @@
 
 
 %changelog
+* Fri Feb 13 2009 Jon Ciesla <limb at jcomserv.net> - 1.0-8
+- Replace broken data file, BZ 452190.
+
+* Wed Nov 26 2008 Jon Ciesla <limb at jcomserv.net> - 1.0-7
+- Fix fopen, BZ 452190.
+
+* Mon Nov 24 2008 Jon Ciesla <limb at jcomserv.net> - 1.0-6
+- Shorten summary.
+
+* Fri Jun 20 2008 Jon Ciesla <limb at jcomserv.net> - 1.0-5
+- Set terminal to false in .desktop, BZ 452155.
+
 * Mon Jun 16 2008 Jon Ciesla <limb at jcomserv.net> - 1.0-4
 - Fixed launcher script, data locations.
 - Added Hans's newest review patch.