rpms/koules/EL-5 koules-1.4-imake.patch, 1.1, 1.2 koules-1.4-make.patch, 1.1, 1.2 koules-1.4-mode.patch, 1.1, 1.2 koules-1.4-overflows.patch, 1.1, 1.2 koules-1.4-retrace.patch, 1.1, 1.2 koules-1.4-shm.patch, 1.1, 1.2 koules.spec, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/koules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20823

Modified Files:
	koules-1.4-imake.patch koules-1.4-make.patch 
	koules-1.4-mode.patch koules-1.4-overflows.patch 
	koules-1.4-retrace.patch koules-1.4-shm.patch koules.spec 
Log Message:
Marge from devel

koules-1.4-imake.patch:

Index: koules-1.4-imake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-imake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-imake.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-imake.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,5 +1,7 @@
 Install to relative location and look for the sound server in the right place.
 
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- koules1.4/Imakefile.imake	2007-10-28 02:59:43.000000000 +0100
 +++ koules1.4/Imakefile	2007-10-28 03:01:57.000000000 +0100
 @@ -56,7 +56,7 @@

koules-1.4-make.patch:

Index: koules-1.4-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-make.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-make.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,5 +1,7 @@
 Do not add arbitrary compiler flags and install into relative location.
 
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- koules1.4/Makefile.svgalib.make	1998-03-09 16:48:49.000000000 +0100
 +++ koules1.4/Makefile.svgalib	2007-10-29 17:46:02.000000000 +0100
 @@ -24,11 +24,10 @@

koules-1.4-mode.patch:

Index: koules-1.4-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-mode.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-mode.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,6 +1,10 @@
 Dynamically decide about window size based on information from the windowing
 system.
 
+Looks well on bigger displays, yet kind of sucks with network play.
+
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- koules1.4/xlib/init.c.mode	2007-10-28 02:31:47.000000000 +0100
 +++ koules1.4/xlib/init.c	2007-10-28 02:31:55.000000000 +0100
 @@ -362,6 +362,12 @@

koules-1.4-overflows.patch:

Index: koules-1.4-overflows.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-overflows.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-overflows.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-overflows.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,6 +1,8 @@
 This fixes some buffer overflow, that are not severe, unless koules.svga
 is installed setuid root. Not by default. The first hunk is from Debian.
 
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- koules-1.4.orig/koules.sndsrv.linux.c
 +++ koules-1.4/koules.sndsrv.linux.c
 @@ -65,10 +65,9 @@

koules-1.4-retrace.patch:

Index: koules-1.4-retrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-retrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-retrace.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-retrace.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,5 +1,7 @@
 This include no longer exists and seems unneeded.
 
+Lubomir Rintel <lkundrak at v3.sk>
+
 --- koules1.4/svgalib/init.c.orig	2007-10-28 00:21:19.000000000 +0200
 +++ koules1.4/svgalib/init.c	2007-10-28 00:21:35.000000000 +0200
 @@ -44,7 +44,6 @@

koules-1.4-shm.patch:

Index: koules-1.4-shm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules-1.4-shm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-shm.patch	4 Nov 2007 19:51:48 -0000	1.1
+++ koules-1.4-shm.patch	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,4 +1,7 @@
-Fix disabling of XShm support, which is broken in xkoules.
+Fix depth detection anddisabling of XShm support. Now that we get
+depth right, we no longer disable XShm though.
+
+Lubomir Rintel <lkundrak at v3.sk>
 
 --- koules1.4/xlib/init.c.shm	2007-10-28 02:37:54.000000000 +0200
 +++ koules1.4/xlib/init.c	2007-10-28 02:38:49.000000000 +0200
@@ -45,13 +48,16 @@
  	}
        else
  	{
-@@ -410,7 +420,9 @@
+@@ -411,8 +427,11 @@ initialize (char **argv, int argc)
  	}
      }
    else
 +#ifdef MITSHM
      bpp = 1;
+-  depth = vinfo_return.depth;
 +#endif
-   depth = vinfo_return.depth;
++  if (depth = vinfo_return.depth > 24)
++    depth = 24;
  #ifdef MITSHM
    /* Make sure all is destroyed if killed off */
+ 


Index: koules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-5/koules.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules.spec	4 Nov 2007 19:51:48 -0000	1.1
+++ koules.spec	19 Mar 2009 22:13:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           koules
 Version:        1.4
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Action game with multiplayer, network and sound support
 
 Group:          Amusements/Games
@@ -40,28 +40,18 @@
 Patch23:        koules-1.4-shm.patch
 Patch24:        koules-1.4-mode.patch
 
-%ifarch %{ix86} x86_64
-%package svgalib
-Summary:        SVGAlib based variant of a multiplayer action game
-Group:          Amusements/Games
-%endif
-
-%package x11
-Summary:        X Window system variant of a multiplayer action game
-Group:          Amusements/Games
-
-%package sound
-Summary:        Sound files for a classic Linux multiplayer action game
-Group:          Amusements/Games
-
-
 %description
 Koules is a fast action arcade-style game.  It works in fine resolution
 with cool 256 color graphics, multiplayer mode up to 5 players, full sound
 and, of course, network support.  Koules is an original idea. First version
 of Koules was developed from scratch by Jan Hubicka in July 1995.
 
+
 %ifarch %{ix86} x86_64
+%package svgalib
+Summary:        SVGAlib based variant of a multiplayer action game
+Group:          Amusements/Games
+
 %description svgalib
 This package contains variant of a classic Linux arcade game with SVGAlib
 support and can act as a network server for multiplayer game.  Use of this
@@ -69,10 +59,21 @@
 as a network server.  Use koules-x11 package instead whenever possible.
 %endif
 
+
+%package x11
+Summary:        X Window system variant of a multiplayer action game
+Group:          Amusements/Games
+Requires:       xorg-x11-fonts-misc
+
 %description x11
 This package contains variant of a classic Linux arcade game with X Window
 System support and can act as a network server for multiplayer game.
 
+
+%package sound
+Summary:        Sound files for a classic Linux multiplayer action game
+Group:          Amusements/Games
+
 %description sound
 This package contains sound files for a classic Linux arcade game. To make
 sound functioning in Koules you either need to ensure exclusive access to
@@ -122,10 +123,7 @@
 
 # Build X11 variant
 cd $RPM_BUILD_DIR/%{name}-%{version}-x11/%{name}%{version}
-# Xshm is broken at the time
-echo '#undef MITSHM' >> Iconfig
-echo '#define HAVEUSLEEP' >> Iconfig
-#sed 's,#define MITSHM,#undef MITSHM,' -i Iconfig
+echo '#define HAVEUSLEEP' >>Iconfig
 xmkmf -a
 make %{makedirs} CCOPTIONS="%{optflags}"
 
@@ -140,7 +138,7 @@
 # Install SVGAlib variant
 cd $RPM_BUILD_DIR/%{name}-%{version}-svga/%{name}%{version}
 make -f Makefile.svgalib install %{makedirs} DESTDIR=$RPM_BUILD_ROOT \
-	INSTALLSOUND=False
+        INSTALLSOUND=False
 %endif
 
 # Install X11 variant, and sound
@@ -169,8 +167,9 @@
 %doc %{name}%{version}/TODO
 
 %files sound
+%defattr(-,root,root,-)
 %{_datadir}/%{name}
-%{_libexecdir}/%{name}/koules.sndsrv.linux
+%{_libexecdir}/%{name}
 
 %ifarch %{ix86} x86_64
 %files svgalib
@@ -186,5 +185,18 @@
 
 
 %changelog
+* Mon Mar 16 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-5
+- Require fonts
+- Fix Xshm support
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 1 2008 Lubomir Rintel <lkundrak at v3.sk> 1.4-3
+- Own /usr/libexec/koules (#473931)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4-2
+- Autorebuild for GCC 4.3
+
 * Sun Oct 28 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.4-1
 - From Red Hat Linux 4.2 back into life