rpms/gyachi/F-8 .cvsignore, 1.15, 1.16 gyachi.spec, 1.19, 1.20 sources, 1.15, 1.16
Gregory D Hosler
ghosler at fedoraproject.org
Fri Dec 26 15:42:04 UTC 2008
Author: ghosler
Update of /cvs/pkgs/rpms/gyachi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20040
Modified Files:
.cvsignore gyachi.spec sources
Log Message:
backported spec file changed from f-9/10/11 to here.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Nov 2008 14:48:15 -0000 1.15
+++ .cvsignore 26 Dec 2008 15:41:34 -0000 1.16
@@ -1 +1 @@
-gyachi-1.1.59.tar.gz
+gyachi-1.1.60.tar.gz
Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gyachi.spec 28 Nov 2008 02:14:21 -0000 1.19
+++ gyachi.spec 26 Dec 2008 15:41:34 -0000 1.20
@@ -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: 6%{?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,150 +122,140 @@
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
-%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
+%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
%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
-%else
-Obsoletes: 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
+%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
-%else
-Obsoletes: 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
-%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
-%else
-Obsoletes: plugin-pulseaudio
%endif
%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.
@@ -239,16 +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 \
--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}
@@ -261,11 +293,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
@@ -292,9 +324,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
@@ -302,9 +336,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
@@ -312,7 +348,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
@@ -359,6 +395,11 @@
%changelog
+* Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
+- Fixed plugin obsoletes.
+- 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 25 Nov 2008 14:48:15 -0000 1.15
+++ sources 26 Dec 2008 15:41:34 -0000 1.16
@@ -1 +1 @@
-e9c8767b35b3bf17ea152ed79c9c8ef0 gyachi-1.1.59.tar.gz
+d0785b39cc138761b425fd0e973d5d5b gyachi-1.1.60.tar.gz
More information about the fedora-extras-commits
mailing list