rpms/gyachi/EL-4 theme_support.patch,NONE,1.1 gyachi.spec,1.2,1.3

[Gregory D Hosler (ghosler)]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28633

Modified Files:
	gyachi.spec 
Added Files:
	theme_support.patch 
Log Message:
Fixes from EL5 branch.



theme_support.patch:

--- NEW FILE theme_support.patch ---
diff -ru -x '*~' -N gyachi-1.1.36.cvs/lib/theme_support.c gyachi-1.1.36.patch/lib/theme_support.c
--- gyachi-1.1.36.cvs/lib/theme_support.c	2008-06-15 23:01:17.000000000 +0800
+++ gyachi-1.1.36.patch/lib/theme_support.c	2008-06-19 22:34:18.000000000 +0800
@@ -87,8 +87,12 @@
 {
 	GYACHI_ICON_DEF *icon_def;
 	char *name=strdup(filename);
+	char *ext;
 
-	*strchrnul(name, '.') = 0;
+	ext = strchr(name, '.');
+	if (ext) {
+		*ext = NULL;
+	}
 
 	for (icon_def = gyachi_icons;
 	     icon_def->filename;


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-4/gyachi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gyachi.spec	19 Jun 2008 12:49:06 -0000	1.2
+++ gyachi.spec	20 Jun 2008 12:28:49 -0000	1.3
@@ -2,13 +2,17 @@
 %define _without_wine 1
 %endif
 
-%if 0%{?fc7}
+%if 0%{?fc7}%{?el4}%{?el5}
 %define _without_pulseaudio 1
 %endif
 
+%if 0%{?rhel}
+%define _without_xmms 1
+%endif
+
 Name:		gyachi
 Version:	1.1.35
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -16,6 +20,7 @@
 URL:		http://gyachi.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 #Patch0:	configure.patch
+Patch0:		theme_support.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	autoconf automake gawk sed
@@ -97,6 +102,7 @@
 Photo album plugin for GyachI
 
 
+%if 0%{!?_without_xmms:1}
 %package        plugin-xmms
 Summary:        XMMS plugin for GyachI
 Group:          Applications/Internet
@@ -106,6 +112,7 @@
 
 %description plugin-xmms
 XMMS plugin for GyachI
+%endif
 
 
 %package        plugin-libnotify
@@ -153,7 +160,7 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 
 %build
@@ -164,7 +171,7 @@
 	%{?_without_wine:--disable-wine} \
 	%{?_without_pulseaudio:--disable-plugin_pulseaudio} \
 	--enable-plugin_photo_album \
-	--enable-plugin_xmms
+	%{!?_without_xmms:--enable-plugin_xmms}
 
 
 make %{?_smp_mflags}
@@ -222,9 +229,11 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}photos.so
 
+%if 0%{!?_without_xmms:1}
 %files plugin-xmms
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}xmms.so
+%endif
 
 %files plugin-libnotify
 %defattr(-,root,root,-)
@@ -253,6 +262,10 @@
 
 
 %changelog
+* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-7
+- disabled xmms plugin for rhel, pulseaudio for EL4/EL5
+- removed a gnu extension strchrnul in theme_support.c
+
 * Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-6
 - Made Alsa driver a plugin, added pulseaudio support as a plugin.
 - Disabled pulseaudio plugin for F7