rpms/rott/devel rott-1.0-more-fixes.patch, 1.1, 1.2 rott.spec, 1.2, 1.3

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Thu Aug 9 06:08:48 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/rott/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13650

Modified Files:
	rott-1.0-more-fixes.patch rott.spec 
Log Message:
* Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Update License tag for new Licensing Guidelines compliance
- Fix 2 calls of memset with the 2nd and 3th argument swaped,
  reported by Dave Jones


rott-1.0-more-fixes.patch:

Index: rott-1.0-more-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/rott-1.0-more-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rott-1.0-more-fixes.patch	18 May 2007 15:30:06 -0000	1.1
+++ rott-1.0-more-fixes.patch	9 Aug 2007 06:08:44 -0000	1.2
@@ -18,3 +18,24 @@
  	script_p = scriptbuffer;
  	scriptend_p = script_p + size;
  	scriptline = 1;
+diff -up rott-1.0/rott/rt_main.c~ rott-1.0/rott/rt_main.c
+--- rott-1.0/rott/rt_main.c~	2007-08-09 08:00:34.000000000 +0200
++++ rott-1.0/rott/rt_main.c	2007-08-09 08:00:34.000000000 +0200
+@@ -3241,7 +3241,7 @@ void WritePCX (char * file, byte * sourc
+        *    unlike in CONVERT.EXE.
+        */
+ 
+-   memset (&pcxHDR, sizeof(PCX_HEADER), 0);
++   memset (&pcxHDR, 0, sizeof(PCX_HEADER));
+ 
+    pcxHDR.manufacturer  = 10;
+    pcxHDR.version       = 5;
+@@ -3274,7 +3274,7 @@ void WritePCX (char * file, byte * sourc
+   //
+    SafeWrite(pcxhandle,&pcxHDR, sizeof (PCX_HEADER));
+ 
+-   memset (buffer1, GAP_SIZE, 0);
++   memset (buffer1, 0, GAP_SIZE);
+ 
+    SafeWrite (pcxhandle, &buffer1, GAP_SIZE);
+ 


Index: rott.spec
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/rott.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rott.spec	21 May 2007 22:14:51 -0000	1.2
+++ rott.spec	9 Aug 2007 06:08:44 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           rott
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Rise of the Triad
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://icculus.org/rott/
 Source0:        http://icculus.org/rott/releases/rott-1.0.tar.gz
 Source1:        rott-shareware.sh
@@ -119,19 +119,27 @@
 
 %post shareware
 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 shareware
 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
 
 %post registered
 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 registered
 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 shareware
@@ -153,6 +161,11 @@
 
 
 %changelog
+* Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Update License tag for new Licensing Guidelines compliance
+- Fix 2 calls of memset with the 2nd and 3th argument swaped,
+  reported by Dave Jones
+
 * Fri May 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - Add missing autodownloader Requires to rott-shareware
 




More information about the fedora-extras-commits mailing list