rpms/gyachi/EL-4 gyachi.spec,1.3,1.4

[Gregory D Hosler (ghosler)]

Author: ghosler

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

Modified Files:
	gyachi.spec 
Log Message:
conditionalized gpgme & libnotify. RHEL4 can't do these.




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-4/gyachi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gyachi.spec	20 Jun 2008 12:28:49 -0000	1.3
+++ gyachi.spec	20 Jun 2008 13:00:27 -0000	1.4
@@ -6,13 +6,18 @@
 %define _without_pulseaudio 1
 %endif
 
+%if 0%{?el4}
+%define _without_gpgme 1
+%define _without_libnotify 1
+%endif
+
 %if 0%{?rhel}
 %define _without_xmms 1
 %endif
 
 Name:		gyachi
 Version:	1.1.35
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -26,9 +31,17 @@
 BuildRequires:	autoconf automake gawk sed
 BuildRequires:	expat-devel gettext-devel
 BuildRequires:	glibc-devel >= 2.2.0 gtkhtml2-devel
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	libXt-devel expat-devel
-BuildRequires:	gettext-devel gtkhtml2-devel libtool libtool-ltdl-devel
+%if 0%{?el4}
+BuildRequires:	libtool
+%else
+BuildRequires:	libtool libtool-ltdl-devel
+%endif
+%if 0%{?el4}
+BuildRequires:	xorg-x11-devel
+%else
+BuildRequires:	libXt-devel
+%endif
+BuildRequires:	gettext-devel gtkhtml2-devel
 BuildRequires:	desktop-file-utils ImageMagick
 BuildRequires:	openssl-devel
 BuildRequires:	gtk2-devel
@@ -72,6 +85,7 @@
 Blowfish encryption plugin for GyachI
 
 
+%if 0%{!?_without_gpgme:1}
 %package        plugin-gpgme
 Summary:        GPGMe encryption plugin for GyachI
 Group:          Applications/Internet
@@ -80,6 +94,7 @@
 
 %description plugin-gpgme
 GPGMe encryption plugin for GyachI
+%endif
 
 
 %package        plugin-mcrypt
@@ -115,6 +130,7 @@
 %endif
 
 
+%if 0%{!?_without_libnotify:1}
 %package        plugin-libnotify
 Summary:        libnotify popup replacement
 Group:          Applications/Internet
@@ -123,6 +139,7 @@
 
 %description plugin-libnotify
 libnotify plugin for GyachI
+%endif
 
 
 %package        plugin-alsa
@@ -169,7 +186,9 @@
 %configure --disable-rpath --enable-v4l2 \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
+	%{?_without_gpgme:--disable-plugin_gpgme} \
 	%{?_without_pulseaudio:--disable-plugin_pulseaudio} \
+	%{?_without_libnotify:--disable-plugin_libnotify} \
 	--enable-plugin_photo_album \
 	%{!?_without_xmms:--enable-plugin_xmms}
 
@@ -217,9 +236,11 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}blowfish.so
 
+%if 0%{!?_without_gpgme:1}
 %files plugin-gpgme
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}gpgme.so
+%endif
 
 %files plugin-mcrypt
 %defattr(-,root,root,-)
@@ -235,9 +256,11 @@
 %{_libdir}/%{name}/plugins/%{name}xmms.so
 %endif
 
+%if 0%{!?_without_libnotify:1}
 %files plugin-libnotify
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/%{name}libnotify.so
+%endif
 
 %files plugin-alsa
 %defattr(-,root,root,-)
@@ -262,6 +285,10 @@
 
 
 %changelog
+* Fri Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-8
+- disabled libnotify, gpgme for RHEL4, changed libXt-devel and
+- libtool-ltdl-devel for RHEL4
+
 * 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