rpms/gyachi/devel gyachi.spec,1.37,1.38

[Gregory D Hosler]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18740

Modified Files:
	gyachi.spec 
Log Message:
Fixed plugin obsoletes.




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gyachi.spec	21 Dec 2008 05:03:02 -0000	1.37
+++ gyachi.spec	22 Dec 2008 16:30:11 -0000	1.38
@@ -5,24 +5,29 @@
 
 %ifnarch i386
 %define _without_wine 1
+%undefine _with_wine
 %endif
 
 %if 0%{?fc7}%{?el4}%{?el5}
 %define _without_pulseaudio 1
+%undefine _with_pulseaudio
 %endif
 
 %if 0%{?el4}
 %define _without_gpgme 1
+%undefine _with_gpgme
 %define _without_libnotify 1
+%undefine _with_libnotify
 %endif
 
 %if 0%{?rhel}
 %define _without_xmms 1
+%undefine _with_xmms
 %endif
 
 Name:		gyachi
-Version:	1.1.59
-Release:	7%{?dist}
+Version:	1.1.60
+Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -62,6 +67,40 @@
 %endif
 Requires:	ImageMagick
 
+%if 0%{?_without_blowfish:1}
+Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
+%endif
+
+%if 0%{?_without_gpgme:1}
+Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
+%endif
+
+%if 0%{?_without_mcrypt:1}
+Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
+%endif
+
+%if 0%{!?_with_photo_album:1}
+Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
+%endif
+
+%if 0%{!?_with_xmms:1}
+Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
+%endif
+
+%if 0%{?_without_libnotify:1}
+Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
+%endif
+
+%if 0%{?_without_pulseaudio:1}
+Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
+%endif
+
+%if 0%{!?_without_gtkspell:1}
+Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
+%endif
+
+
 %description
 GYachI is a Linux client for Yahoo! Messenger protocol, 
 written using GTK+ GUI toolkit. This package includes both 
@@ -81,13 +120,15 @@
 kao i programi za korišćenje web-kamere (slanje i primanje slike).
 
 
-%package        plugin-blowfish
+%if 0%{!?_without_blowfish:1}
+%package	plugin-blowfish
 Summary:	Blowfish encryption plugin for GyachI
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
 
 %description	plugin-blowfish
 Blowfish encryption plugin for GyachI
+%endif
 
 
 %if 0%{!?_without_gpgme:1}
@@ -99,11 +140,10 @@
 
 %description	plugin-gpgme
 GPGMe encryption plugin for GyachI
-%else
-Obsoletes:	plugin-gpgme
 %endif
 
 
+%if 0%{!?_without_mcrypt:1}
 %package	plugin-mcrypt
 Summary:	MCrypt encryption plugin for GyachI
 Group:		Applications/Internet
@@ -113,6 +153,7 @@
       
 %description	plugin-mcrypt
 MCrypt encryption plugin for GyachI
+%endif
 
 
 %if 0%{?_with_photo_album:1}
@@ -123,16 +164,10 @@
 
 %description	plugin-photo_album
 Photo album plugin for GyachI
-Obsoletes:	gyachi-plugin-photosharing
-Obsoletes:	gyachi-plugin-photo_album
-%else
-Obsoletes:	plugin-photo_album
-Obsoletes:	gyachi-plugin-photosharing
-Obsoletes:	gyachi-plugin-photo_album
 %endif
 
 
-%if 0%{!?_without_xmms:1}
+%if 0%{?_with_xmms:1}
 %package	plugin-xmms
 Summary:	XMMS plugin for GyachI
 Group:		Applications/Internet
@@ -142,10 +177,6 @@
 
 %description	plugin-xmms
 XMMS plugin for GyachI
-Obsoletes:	gyachi-plugin-xmms
-%else
-Obsoletes:	plugin-xmms
-Obsoletes:	gyachi-plugin-xmms
 %endif
 
 
@@ -158,8 +189,6 @@
 
 %description	plugin-libnotify
 libnotify plugin for GyachI
-%else
-Obsoletes:	plugin-libnotify
 %endif
 
 
@@ -182,10 +211,8 @@
 BuildRequires:	pulseaudio-libs-devel
 Requires:	pulseaudio-libs
 
-%description plugin-pulseaudio
+%description	plugin-pulseaudio
 PulseAudio sound driver for gyachi
-%else
-Obsoletes:	plugin-pulseaudio
 %endif
 
 
@@ -199,8 +226,6 @@
 
 %description	plugin-gtkspell
 Spell check plugin for gyachi using gtkspell
-%else
-Obsoletes:	plugin-gtkspell
 %endif
 
 
@@ -244,13 +269,14 @@
 %configure --disable-rpath \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
+	%{?_without_blowfish:--disable-plugin_blowfish} \
+	%{?_without_mcrypt:--disable-plugin_mcrypt} \
 	%{?_without_gpgme:--disable-plugin_gpgme} \
 	%{?_without_pulseaudio:--disable-plugin_pulseaudio} \
 	%{?_without_libnotify:--disable-plugin_libnotify} \
 	%{?_without_gktspell:--disable-plugin_gtkspell} \
-	%{?_without_photo_album:--disable-plugin_photo_album} \
-	%{!?_without_xmms:--enable-plugin_xmms}
-
+	%{?_with_photo_album:--enable-plugin_photo_album} \
+	%{?_with_xmms:--enable-plugin_xmms} 
 
 make %{?_smp_mflags}
 
@@ -294,9 +320,11 @@
 %{_docdir}/%{name}-%{version}
 %docdir %{_docdir}/%{name}-%{version}
 
+%if 0%{!?_without_blowfish:1}
 %files plugin-blowfish
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/lib%{name}blowfish.so
+%endif
 
 %if 0%{!?_without_gpgme:1}
 %files plugin-gpgme
@@ -304,9 +332,11 @@
 %{_libdir}/%{name}/plugins/lib%{name}gpgme.so
 %endif
 
+%if 0%{!?_without_mcrypt:1}
 %files plugin-mcrypt
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/lib%{name}mcrypt.so
+%endif
 
 %if 0%{?_with_photo_album:1}
 %files plugin-photo_album
@@ -314,7 +344,7 @@
 %{_libdir}/%{name}/plugins/lib%{name}photos.so
 %endif
 
-%if 0%{!?_without_xmms:1}
+%if 0%{?_with_xmms:1}
 %files plugin-xmms
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/lib%{name}xmms.so
@@ -361,6 +391,9 @@
 
 
 %changelog
+* Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
+- Fixed plugin obsoletes.
+
 * Fri Dec 19 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 1.1.59-7
 - Fixed wrong obsoletes names for xmms and photo album plugin
 - Fixed rpmlint noise for changelog and removed mix of space and tabs on SRPM