rpms/gyachi/F-9 gyachi.spec,1.18,1.19

[Rakesh Pandit]

Author: rakesh

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

Modified Files:
	gyachi.spec 
Log Message:
Fixed wrong obsoletes names for xmms and photo album plugin
Fixed rpmlint noise for changelog and removed mix of space and tabs on SRPM
To make rpmlint happy on RPMS, need to introduce some big changes, will consult
actual maintainer first.



Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-9/gyachi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gyachi.spec	28 Nov 2008 02:35:41 -0000	1.18
+++ gyachi.spec	21 Dec 2008 05:05:07 -0000	1.19
@@ -22,7 +22,7 @@
 
 Name:		gyachi
 Version:	1.1.59
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -83,88 +83,92 @@
 kao i programi za korišćenje web-kamere (slanje i primanje slike).
 
 
-%package        plugin-blowfish
-Summary:        Blowfish encryption plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package       plugin-blowfish
+Summary:	Blowfish encryption plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-blowfish
+%description	plugin-blowfish
 Blowfish encryption plugin for GyachI
 
 
 %if 0%{!?_without_gpgme:1}
-%package        plugin-gpgme
-Summary:        GPGMe encryption plugin for GyachI
-Group:          Applications/Internet
-BuildRequires:  gpgme-devel
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-gpgme
+Summary:	GPGMe encryption plugin for GyachI
+Group:		Applications/Internet
+BuildRequires:	gpgme-devel
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-gpgme
+%description	plugin-gpgme
 GPGMe encryption plugin for GyachI
 %else
 Obsoletes:	plugin-gpgme
 %endif
 
 
-%package        plugin-mcrypt
-Summary:        MCrypt encryption plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-Requires:       libmcrypt >= 2.5.0
-Buildrequires:  libmcrypt-devel >= 2.5.0
+%package	plugin-mcrypt
+Summary:	MCrypt encryption plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	libmcrypt >= 2.5.0
+Buildrequires:	libmcrypt-devel >= 2.5.0
       
-%description plugin-mcrypt
+%description	plugin-mcrypt
 MCrypt encryption plugin for GyachI
 
 
 %if 0%{?_with_photo_album:1}
-%package        plugin-photo_album
-Summary:        Photo album plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-photo_album
+Summary:	Photo album plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-photo_album
+%description	plugin-photo_album
 Photo album plugin for GyachI
-Obsoletes:	gyachi-plugin-photosharing
+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}
-%package        plugin-xmms
-Summary:        XMMS plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-Requires:       xmms >= 1.2.0
-Buildrequires:  xmms-devel >= 1.2.0
+%package	plugin-xmms
+Summary:	XMMS plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	xmms >= 1.2.0
+Buildrequires:	xmms-devel >= 1.2.0
 
-%description plugin-xmms
+%description	plugin-xmms
 XMMS plugin for GyachI
+Obsoletes:  gyachi-plugin-xmms
 %else
 Obsoletes:	plugin-xmms
+Obsoletes:	gyachi-plugin-xmms
 %endif
 
 
 %if 0%{!?_without_libnotify:1}
-%package        plugin-libnotify
-Summary:        libnotify popup replacement
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-libnotify
+Summary:	libnotify popup replacement
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 Buildrequires:	libnotify-devel
 
-%description plugin-libnotify
+%description	plugin-libnotify
 libnotify plugin for GyachI
 %else
 Obsoletes:	plugin-libnotify
 %endif
 
 
-%package        plugin-alsa
-Summary:        libalsa sound driver
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-alsa
+Summary:	libalsa sound driver
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 BuildRequires:	alsa-lib-devel >= 0.9
 Requires:	alsa-lib >= 0.9
 
@@ -173,14 +177,14 @@
 
 
 %if 0%{!?_without_pulseaudio:1}
-%package        plugin-pulseaudio
-Summary:        pulseaudio sound driver
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-pulseaudio
+Summary:	pulseaudio sound driver
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 BuildRequires:	pulseaudio-libs-devel
 Requires:	pulseaudio-libs
 
-%description plugin-pulseaudio
+%description	plugin-pulseaudio
 PulseAudio sound driver for gyachi
 %else
 Obsoletes:	plugin-pulseaudio
@@ -188,45 +192,45 @@
 
 
 %if 0%{!?_without_gtkspell:1}
-%package        plugin-gtkspell
-Summary:        gtkspell spell check
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-gtkspell
+Summary:	gtkspell spell check
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 BuildRequires:	gtkspell-devel
 Requires:	gtkspell
 
-%description plugin-gtkspell
+%description	plugin-gtkspell
 Spell check plugin for gyachi using gtkspell
 %else
 Obsoletes:	plugin-gtkspell
 %endif
 
 
-%package recre8-theme
-Summary:        GyachI Prototype theme
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	recre8-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description recre8-theme
+%description	recre8-theme
 %{summary} This package supplies the artwork for the GyachI recre8 theme.
 
 
-%package YMlike-theme
-Summary:        GyachI Prototype theme
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package   	YMlike-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+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.
 
 
-%package pidgy-theme
-Summary:        GyachI Prototype theme
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	pidgy-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description pidgy-theme
+%description	pidgy-theme
 %{summary} This package supplies the artwork for the GyachI pidgy theme.
 This theme uses the pidgin icons, and is copyrighted by it's respective authors.
 
@@ -261,11 +265,11 @@
 %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                   \
-        --vendor fedora                                  \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
-        --mode 0644                                      \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install	--delete-original \
+	--vendor fedora \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--mode 0644 \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -359,6 +363,10 @@
 
 
 %changelog
+* 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
+
 * Fri Nov 28 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.59.6
 - Added Obsoletes for previous versions of modules no longer being built.
 
@@ -444,9 +452,9 @@
 
 * Mon May 05 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.32-1
 - updated gyachi to 1.1.32 from upstream
-- fixed %files to include the full documentation directory, and the new
+- fixed %%files to include the full documentation directory, and the new
 - libgyachi library.
-- updated configure to set libdir & libexecdir to be %{_libdir} (x64 lib fix)
+- updated configure to set libdir & libexecdir to be %%{_libdir} (x64 lib fix)
 - added new gyachi modules (libnotify, and recre8)
 - updated the name change of the old photosharing module to photo_album