rpms/njam/devel njam-1.25-drop-setgid.patch, 1.1, 1.2 njam.desktop, 1.2, 1.3 njam.spec, 1.6, 1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	njam-1.25-drop-setgid.patch njam.desktop njam.spec 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.25-8
- Fix compilation with gcc 4.3


njam-1.25-drop-setgid.patch:

Index: njam-1.25-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/njam/devel/njam-1.25-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- njam-1.25-drop-setgid.patch	29 Mar 2006 19:45:02 -0000	1.1
+++ njam-1.25-drop-setgid.patch	12 Jan 2008 10:57:04 -0000	1.2
@@ -1,15 +1,6 @@
 diff -ur njam-1.25-src.orig/src/njam.cpp njam-1.25-src/src/njam.cpp
 --- njam-1.25-src.orig/src/njam.cpp	2005-12-13 12:56:43.000000000 +0100
 +++ njam-1.25-src/src/njam.cpp	2006-03-26 20:29:22.000000000 +0200
-@@ -32,6 +32,8 @@
- -----------------------------------------------------------------------------*/
- // needed for chdir
- #ifdef __linux__
-+/* this must be done before the first include of unistd.h for setresgid */
-+#define _GNU_SOURCE 
- #include <unistd.h>
- #include <defaults.h>
- #endif
 @@ -47,12 +49,24 @@
  #include "njamfont.h"
  #include "njammap.h"


Index: njam.desktop
===================================================================
RCS file: /cvs/extras/rpms/njam/devel/njam.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- njam.desktop	12 Aug 2007 09:42:39 -0000	1.2
+++ njam.desktop	12 Jan 2008 10:57:04 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Njam
 Comment=Eat all the cookies while avoiding the badguys
 Exec=njam
-Icon=njam.png
+Icon=njam
 Terminal=false
 StartupNotify=false
 Type=Application


Index: njam.spec
===================================================================
RCS file: /cvs/extras/rpms/njam/devel/njam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- njam.spec	23 Dec 2007 09:15:56 -0000	1.6
+++ njam.spec	12 Jan 2008 10:57:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           njam
 Version:        1.25
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Maze-game, eat all the cookies while avoiding the badguys
 Group:          Amusements/Games
 License:        GPLv2+
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.25-8
+- Fix compilation with gcc 4.3
+
 * Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.25-7
 - Fix Source0 URL