rpms/xgalaxy/devel xgalaxy-2.0.34-xgalaxy.patch, 1.3, 1.4 xgalaxy.spec, 1.8, 1.9

Mon Sep 8 10:17:33 UTC 2008

Author: jwrdegoede

Update of /cvs/pkgs/rpms/xgalaxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31638

Modified Files:
	xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 2.0.34-9
- Fix patch fuzz build failure


xgalaxy-2.0.34-xgalaxy.patch:

Index: xgalaxy-2.0.34-xgalaxy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- xgalaxy-2.0.34-xgalaxy.patch	31 May 2006 20:42:33 -0000	1.3
+++ xgalaxy-2.0.34-xgalaxy.patch	8 Sep 2008 10:17:02 -0000	1.4
@@ -1,6 +1,32 @@
---- xgalaga-2.0.34/images.c.xgalaxy	2006-05-31 22:24:50.000000000 +0200
-+++ xgalaga-2.0.34/images.c	2006-05-31 22:24:50.000000000 +0200
-@@ -6786,54 +6786,108 @@
+diff -up xgalaga-2.0.34/README.foo xgalaga-2.0.34/README
+--- xgalaga-2.0.34/README.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/README	2008-09-08 08:50:32.000000000 +0200
+@@ -44,9 +44,9 @@ Command line options:
+   <anything else>      print usage and version.
+ 
+ Basic instructions:
+-  It's Galaga, you know how to play Galaga, stop bothering me.
+-  (Ship follows the mouse, button fires.  Auto-fire by holding it
+-   down, so no-one accuses me of breaking their mouse!)
++  It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
++  stop bothering me. (Ship follows the mouse, button fires.  Auto-fire by
++  holding it down, so no-one accuses me of breaking their mouse!)
+ 
+ Keyboard commands:
+ 
+@@ -73,7 +73,7 @@ it takes care of every aspect of the X i
+ games written quickly and painlessly.
+ 
+ Credits:
+-   Galaga code: 
++   XGalaxy code: 
+             Joe Rumsey (mrogre at mediaone.net)
+    X interface:
+             Bill Dyess(dyessww at eng.auburn.edu), 
+diff -up xgalaga-2.0.34/images.c.foo xgalaga-2.0.34/images.c
+--- xgalaga-2.0.34/images.c.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/images.c	2008-09-08 08:50:32.000000000 +0200
+@@ -6786,54 +6786,108 @@ static char * shield_xpm[] = {
  /* XPM */
  static char * title_xpm[] = {
  /* width height ncolors chars_per_pixel */
@@ -155,33 +181,10 @@
  
  /* keep sorted (for bsearch) [BDyess] */
  static W_Image imagearray[] = {
---- xgalaga-2.0.34/README.xgalaxy	2006-05-31 22:24:51.000000000 +0200
-+++ xgalaga-2.0.34/README	2006-05-31 22:24:51.000000000 +0200
-@@ -44,9 +44,9 @@
-   <anything else>      print usage and version.
- 
- Basic instructions:
--  It's Galaga, you know how to play Galaga, stop bothering me.
--  (Ship follows the mouse, button fires.  Auto-fire by holding it
--   down, so no-one accuses me of breaking their mouse!)
-+  It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga,
-+  stop bothering me. (Ship follows the mouse, button fires.  Auto-fire by
-+  holding it down, so no-one accuses me of breaking their mouse!)
- 
- Keyboard commands:
- 
-@@ -73,7 +73,7 @@
- games written quickly and painlessly.
- 
- Credits:
--   Galaga code: 
-+   XGalaxy code: 
-             Joe Rumsey (mrogre at mediaone.net)
-    X interface:
-             Bill Dyess(dyessww at eng.auburn.edu), 
---- xgalaga-2.0.34/main.c.xgalaxy	2006-05-31 22:25:01.000000000 +0200
-+++ xgalaga-2.0.34/main.c	2006-05-31 22:26:42.000000000 +0200
-@@ -97,15 +97,15 @@
+diff -up xgalaga-2.0.34/main.c.foo xgalaga-2.0.34/main.c
+--- xgalaga-2.0.34/main.c.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/main.c	2008-09-08 08:50:32.000000000 +0200
+@@ -97,15 +97,15 @@ Command line options:\n\
  -window              Start in windowed mode instead of fullscreen\n\
  -winsize <WxH>       Window size (default 468 x 596)\n\
  -b                   turn buffered mode off, use this if it runs\n\
@@ -202,8 +205,9 @@
  \n\
  Keyboard commands:\n\
  \n\
---- xgalaga-2.0.34/xgal.6x.xgalaxy	2006-05-31 22:24:51.000000000 +0200
-+++ xgalaga-2.0.34/xgal.6x	2006-05-31 22:24:51.000000000 +0200
+diff -up xgalaga-2.0.34/xgal.6x.foo xgalaga-2.0.34/xgal.6x
+--- xgalaga-2.0.34/xgal.6x.foo	2008-09-08 08:50:19.000000000 +0200
++++ xgalaga-2.0.34/xgal.6x	2008-09-08 08:50:32.000000000 +0200
 @@ -1,6 +1,6 @@
 -.TH XGALAGA 6x "23 April 2003" "2.0.34"
 +.TH XGALAXY 6 "23 April 2003" "2.0.34"
@@ -212,8 +216,8 @@
 +xgalaga \- X11 Galaga like game
  .SH SYNOPSIS
  .B xgalaga
- [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl]
-@@ -11,9 +11,9 @@
+ [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+@@ -11,9 +11,9 @@ xgalaga \- X11 version of the famous Gal
  [-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars]
  .SH INSTRUCTIONS
  .LP
@@ -226,7 +230,7 @@
  .P
  The xgalaga-hyperspace version features some new weapons and different
  gameplay.
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ x - use your shields (xgalaga-hyperspace
  .TP 8
  alt-enter - Toggle full screen node.
  .SH "SEE ALSO"


Index: xgalaxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xgalaxy.spec	19 Feb 2008 09:53:03 -0000	1.8
+++ xgalaxy.spec	8 Sep 2008 10:17:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Galaxian / Galaga like game with powerups
 Group:          Amusements/Games
 License:        GPL+
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 2.0.34-9
+- Fix patch fuzz build failure
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.34-8
 - Autorebuild for GCC 4.3
 


