rpms/gyachi/EL-5 .cvsignore, 1.7, 1.8 gyachi.spec, 1.15, 1.16 sources, 1.7, 1.8

[Gregory D Hosler]

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21538

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
update to upstream 1.1.61




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 16:22:33 -0000	1.7
+++ .cvsignore	3 Jan 2009 16:41:11 -0000	1.8
@@ -1 +1 @@
-gyachi-1.1.46.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/gyachi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gyachi.spec	8 Aug 2008 16:22:33 -0000	1.15
+++ gyachi.spec	3 Jan 2009 16:41:11 -0000	1.16
@@ -1,23 +1,33 @@
+%define _without_photo_album 1
+%undefine _with_photo_album
+%define _without_xmms 1
+%undefine _with_xmms
+
 %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.46
-Release:	4%{?dist}
+Version:	1.1.61
+Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -46,6 +56,9 @@
 BuildRequires:	openssl-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	jasper-devel >= 1.701.0
+%if 0%{?fc10}
+BuildRequires:	libv4l-devel
+%endif
 
 Requires:	gtk2
 #jasper >= 1.701 needed for memory leak fix.
@@ -56,7 +69,39 @@
 %endif
 Requires:	ImageMagick
 
-Obsoletes:	gyachi-plugin-photosharing
+%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, 
@@ -77,105 +122,144 @@
 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}
+%if 0%{!?_without_blowfish:1}
+%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
+%endif
 
 
 %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
 %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
+%if 0%{!?_without_mcrypt:1}
+%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
+%endif
 
 
-%package        plugin-photo_album
-Summary:        Photo album plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%if 0%{?_with_photo_album:1}
+%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
+%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
+%if 0%{?_with_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
 
-%description plugin-xmms
+%description	plugin-xmms
 XMMS plugin for GyachI
 %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
 %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
 
-%description plugin-alsa
+%description	plugin-alsa
 ALSA sound driver for gyachi
 
 
 %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
 %endif
 
 
-%package recre8-theme
-Summary:        GyachI Prototype theme
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%if 0%{!?_without_gtkspell:1}
+%package	plugin-gtkspell
+Summary:	gtkspell spell check
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+BuildRequires:	gtkspell-devel
+Requires:	gtkspell
+
+%description	plugin-gtkspell
+Spell check plugin for gyachi using gtkspell
+%endif
+
+
+%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}
+
+%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}
+
+%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.
+
+
 %prep
 %setup -q
 #%patch0 -p1
@@ -184,15 +268,19 @@
 %build
 ./autogen.sh
 
+#NOTE: xmms & photo_album are disabled, by default, in configure.
+#      if either are wanted, then they must be explicitely enabled!
 %configure --disable-rpath --enable-v4l2 \
 	--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} \
-	--enable-plugin_photo_album \
-	%{!?_without_xmms:--enable-plugin_xmms}
-
+	%{?_without_gktspell:--disable-plugin_gtkspell} \
+	%{?_with_photo_album:--enable-plugin_photo_album} \
+	%{?_with_xmms:--enable-plugin_xmms} 
 
 make %{?_smp_mflags}
 
@@ -200,14 +288,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+rm $RPM_BUILD_ROOT%{_libdir}/libgyachi.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libgyachi*.la
 %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
@@ -228,64 +318,86 @@
 %{_datadir}/%{name}/themes/gyachi-classic
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/%{name}-*
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/libgyachi.so
 %{_docdir}/%{name}-%{version}
 %docdir %{_docdir}/%{name}-%{version}
 
+%if 0%{!?_without_blowfish:1}
 %files plugin-blowfish
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}blowfish.so
+%{_libdir}/%{name}/plugins/lib%{name}blowfish.so
+%endif
 
 %if 0%{!?_without_gpgme:1}
 %files plugin-gpgme
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}gpgme.so
+%{_libdir}/%{name}/plugins/lib%{name}gpgme.so
 %endif
 
+%if 0%{!?_without_mcrypt:1}
 %files plugin-mcrypt
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}mcrypt.so
+%{_libdir}/%{name}/plugins/lib%{name}mcrypt.so
+%endif
 
+%if 0%{?_with_photo_album:1}
 %files plugin-photo_album
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}photos.so
+%{_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/%{name}xmms.so
+%{_libdir}/%{name}/plugins/lib%{name}xmms.so
 %endif
 
 %if 0%{!?_without_libnotify:1}
 %files plugin-libnotify
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}libnotify.so
+%{_libdir}/%{name}/plugins/lib%{name}libnotify.so
 %endif
 
 %files plugin-alsa
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}alsa.so
+%{_libdir}/%{name}/plugins/lib%{name}alsa.so
 
 %if 0%{!?_without_pulseaudio:1}
 %files plugin-pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}pulseaudio.so
+%{_libdir}/%{name}/plugins/lib%{name}pulseaudio.so
+%endif
+
+%if 0%{!?_without_gtkspell:1}
+%files plugin-gtkspell
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/plugins/lib%{name}gtkspell.so
 %endif
 
 %files recre8-theme
 %defattr(-,root,root,-)
-/usr/share/%{name}/themes/recre8/*
+%{_datadir}/%{name}/themes/recre8/
+
+%files YMlike-theme
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/themes/YMlike/
 
+%files pidgy-theme
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/themes/pidgy/
 
-%postun
-ldconfig
 
-%post
-ldconfig
+%postun -p /sbin/ldconfig
+
+%post -p /sbin/ldconfig
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Update from upstream.
+
 * Fri Aug  8 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.46-4
 - Update from upstream.
 
@@ -326,9 +438,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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 16:22:33 -0000	1.7
+++ sources	3 Jan 2009 16:41:11 -0000	1.8
@@ -1 +1 @@
-3794be40d2657aa7ff2519e86059c445  gyachi-1.1.46.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz