rpms/gyachi/F-10 .cvsignore, 1.21, 1.22 gyachi.spec, 1.31, 1.32 sources, 1.21, 1.22

[Gregory D Hosler]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27519

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
update from upstream. fix plugin obsoletes.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	25 Nov 2008 15:13:00 -0000	1.21
+++ .cvsignore	22 Dec 2008 16:55:38 -0000	1.22
@@ -1 +1 @@
-gyachi-1.1.59.tar.gz
+gyachi-1.1.60.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/gyachi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gyachi.spec	21 Dec 2008 05:06:31 -0000	1.31
+++ gyachi.spec	22 Dec 2008 16:55:38 -0000	1.32
@@ -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
@@ -64,6 +69,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 
@@ -83,13 +122,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}
@@ -101,11 +142,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
@@ -115,6 +155,7 @@
       
 %description	plugin-mcrypt
 MCrypt encryption plugin for GyachI
+%endif
 
 
 %if 0%{?_with_photo_album:1}
@@ -125,16 +166,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-photo_album
-Obsoletes:	gyachi-plugin-photosharing
 %endif
 
 
-%if 0%{!?_without_xmms:1}
+%if 0%{?_with_xmms:1}
 %package	plugin-xmms
 Summary:	XMMS plugin for GyachI
 Group:		Applications/Internet
@@ -144,10 +179,6 @@
 
 %description	plugin-xmms
 XMMS plugin for GyachI
-Obsoletes:  gyachi-plugin-xmms
-%else
-Obsoletes:	plugin-xmms
-Obsoletes:	gyachi-plugin-xmms
 %endif
 
 
@@ -160,8 +191,6 @@
 
 %description	plugin-libnotify
 libnotify plugin for GyachI
-%else
-Obsoletes:	plugin-libnotify
 %endif
 
 
@@ -172,7 +201,7 @@
 BuildRequires:	alsa-lib-devel >= 0.9
 Requires:	alsa-lib >= 0.9
 
-%description plugin-alsa
+%description	plugin-alsa
 ALSA sound driver for gyachi
 
 
@@ -186,8 +215,6 @@
 
 %description	plugin-pulseaudio
 PulseAudio sound driver for gyachi
-%else
-Obsoletes:	plugin-pulseaudio
 %endif
 
 
@@ -201,8 +228,6 @@
 
 %description	plugin-gtkspell
 Spell check plugin for gyachi using gtkspell
-%else
-Obsoletes:	plugin-gtkspell
 %endif
 
 
@@ -215,12 +240,12 @@
 %{summary} This package supplies the artwork for the GyachI recre8 theme.
 
 
-%package   	YMlike-theme
+%package	YMlike-theme
 Summary:	GyachI Prototype theme
 Group:		Applications/Internet
-Requires:  	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
-%description	   YMlike-theme
+%description	YMlike-theme
 %{summary} This package supplies the artwork for the GyachI YMlike theme.
 This theme is an independent re-implementation of the yahoo theme.
 
@@ -246,13 +271,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}
 
@@ -265,7 +291,7 @@
 %find_lang %{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -sf ../%{name}/themes/gyachi-classic/gyach-icon_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-desktop-file-install	--delete-original \
+desktop-file-install --delete-original \
 	--vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--mode 0644 \
@@ -296,9 +322,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
@@ -306,9 +334,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
@@ -316,7 +346,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
@@ -363,6 +393,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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	25 Nov 2008 15:13:00 -0000	1.21
+++ sources	22 Dec 2008 16:55:38 -0000	1.22
@@ -1 +1 @@
-e9c8767b35b3bf17ea152ed79c9c8ef0  gyachi-1.1.59.tar.gz
+d0785b39cc138761b425fd0e973d5d5b  gyachi-1.1.60.tar.gz