rpms/xmms/devel xmms-1.2.10-gcc4.patch,1.1,1.2 xmms.spec,1.11,1.12

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	xmms-1.2.10-gcc4.patch xmms.spec 
Log Message:
Update gcc4 fix patch.


xmms-1.2.10-gcc4.patch:

Index: xmms-1.2.10-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms-1.2.10-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-1.2.10-gcc4.patch	6 Apr 2005 04:57:33 -0000	1.1
+++ xmms-1.2.10-gcc4.patch	20 Dec 2005 14:47:55 -0000	1.2
@@ -9,3 +9,16 @@
  extern irConfig ircfg;
  extern gboolean irconf_is_going;
  
+--- xmms-1.2.10/xmms/sm.c.orig	2004-01-11 18:33:00.000000000 +0100
++++ xmms-1.2.10/xmms/sm.c	2004-04-12 22:44:28.000000000 +0200
+@@ -147,8 +147,9 @@
+ 
+ #else
+ 
+-void sm_init(int argc, char **argv, const char *previous_session_id)
++const char * sm_init(int argc, char **argv, const char *previous_session_id)
+ {
++	return NULL;
+ }
+ 
+ void sm_cleanup(void)


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms.spec	7 Dec 2005 12:00:03 -0000	1.11
+++ xmms.spec	20 Dec 2005 14:47:55 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18%{?dist}
+Release: 18.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -147,6 +147,9 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-18.1
+- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
+
 * Sat May 28 2005 Matthias Saou <http://freshrpms.net/> 1:1.2.10-18
 - Build with explicit --with-pic to fix compilation of flac plugin on
   x86_64.