rpms/xgalaxy/devel xgalaxy-2.0.34-joy.patch, NONE, 1.1 xgalaxy.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	xgalaxy.spec 
Added Files:
	xgalaxy-2.0.34-joy.patch 
Log Message:
* Thu Jun  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-4
- Workaround broken glibc-kernheaders (bz 193747).
- Add Provides and Obsoletes xgalaga in case people have an xgalaga package
  installed from another source.


xgalaxy-2.0.34-joy.patch:

--- NEW FILE xgalaxy-2.0.34-joy.patch ---
--- xgalaga-2.0.34/linux-joystick.c.joy	2006-06-01 09:16:10.000000000 +0200
+++ xgalaga-2.0.34/linux-joystick.c	2006-06-01 09:22:10.000000000 +0200
@@ -6,10 +6,10 @@
  * Distribute under the terms of the GPL.
  */
 #ifdef __linux__
+#include <sys/types.h>
 #include <linux/joystick.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>


Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xgalaxy.spec	31 May 2006 20:42:33 -0000	1.3
+++ xgalaxy.spec	1 Jun 2006 08:01:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Galaxian / Galaga like game with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -12,9 +12,12 @@
 Patch1:         %{name}-2.0.34-warn.patch
 Patch2:         %{name}-2.0.34-fullscreen.patch
 Patch3:         %{name}-2.0.34-%{name}.patch
+Patch4:         %{name}-2.0.34-joy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel
 BuildRequires:  desktop-file-utils ImageMagick 
+Obsoletes:      xgalaga <= %{version}
+Provides:       xgalaga = %{version}-%{release}
 
 %description
 Arcade game for the X Window System inspired by the classic game Galaga.
@@ -29,6 +32,7 @@
 %patch1 -p1 -z .warn
 %patch2 -p1 -z .fs
 %patch3 -p1 -z .%{name}
+%patch4 -p1 -z .joy
 sed -e 's/Debian/Fedora/g' debian/README.Debian > README.fedora
 cat >> README.fedora << EOF
 
@@ -97,7 +101,12 @@
 
 
 %changelog
-* Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-3
+* Thu Jun  1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-4
+- Workaround broken glibc-kernheaders (bz 193747).
+- Add Provides and Obsoletes xgalaga in case people have an xgalaga package
+  installed from another source.
+
+* Wed May 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-3
 - Fixed ships not being centered when flying in in level 1
 - Fixed artifacts (ships not yet on screen showing) in level 2
 - Added -winsize widthxheight option, which can be used to specify an