rpms/gyachi/F-8 .cvsignore, 1.4, 1.5 gyachi.spec, 1.3, 1.4 sources, 1.4, 1.5
Gregory D Hosler (ghosler)
fedora-extras-commits at redhat.com
Tue Jul 8 13:03:04 UTC 2008
Author: ghosler
Update of /cvs/pkgs/rpms/gyachi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10182
Modified Files:
.cvsignore gyachi.spec sources
Log Message:
plugin-photo_album obsoletes plugin-photosharing
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Jun 2008 17:23:21 -0000 1.4
+++ .cvsignore 8 Jul 2008 13:02:11 -0000 1.5
@@ -1 +1,2 @@
gyachi-1.1.35.tar.gz
+theme_support.patch
Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gyachi.spec 16 Jun 2008 17:23:21 -0000 1.3
+++ gyachi.spec 8 Jul 2008 13:02:11 -0000 1.4
@@ -2,41 +2,58 @@
%define _without_wine 1
%endif
-%if 0%{?fc7}
+%if 0%{?fc7}%{?el4}%{?el5}
%define _without_pulseaudio 1
%endif
-Name: gyachi
-Version: 1.1.35
-Release: 6%{?dist}
-Summary: A Yahoo! chat client with Webcam and voice support
+%if 0%{?el4}
+%define _without_gpgme 1
+%define _without_libnotify 1
+%endif
-Group: Applications/Internet
-License: GPLv2
-URL: http://gyachi.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%if 0%{?rhel}
+%define _without_xmms 1
+%endif
+
+Name: gyachi
+Version: 1.1.35
+Release: 15%{?dist}
+Summary: A Yahoo! chat client with Webcam and voice support
+
+Group: Applications/Internet
+License: GPLv2
+URL: http://gyachi.sourceforge.net
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#Patch0: configure.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: theme_support.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake gawk sed
-BuildRequires: expat-devel gettext-devel
+BuildRequires: expat-devel gettext-devel
BuildRequires: glibc-devel >= 2.2.0 gtkhtml2-devel
-BuildRequires: libtool-ltdl-devel
-BuildRequires: libXt-devel expat-devel
-BuildRequires: gettext-devel gtkhtml2-devel libtool libtool-ltdl-devel
+%if 0%{?el4}
+BuildRequires: libtool
+%else
+BuildRequires: libtool libtool-ltdl-devel
+%endif
+%if 0%{?el4}
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel
+%endif
+BuildRequires: gettext-devel gtkhtml2-devel
BuildRequires: desktop-file-utils ImageMagick
BuildRequires: openssl-devel
-BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: gtk2-devel
BuildRequires: jasper-devel >= 1.701.0
+Requires: gtk2
#jasper >= 1.701 needed for memory leak fix.
-%if 0%{?fc7}
+%if 0%{?fc7}%{?el4}%{?el5}
Requires: jasper >= 1.701.0
%else
Requires: jasper-libs >= 1.701.0
%endif
-
-Requires: gtk2 >= 2.4.0
Requires: ImageMagick
@@ -68,6 +85,7 @@
Blowfish encryption plugin for GyachI
+%if 0%{!?_without_gpgme:1}
%package plugin-gpgme
Summary: GPGMe encryption plugin for GyachI
Group: Applications/Internet
@@ -76,6 +94,7 @@
%description plugin-gpgme
GPGMe encryption plugin for GyachI
+%endif
%package plugin-mcrypt
@@ -93,11 +112,13 @@
Summary: Photo album plugin for GyachI
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
+Obsoletes: plugin-photosharing
%description plugin-photo_album
Photo album plugin for GyachI
+%if 0%{!?_without_xmms:1}
%package plugin-xmms
Summary: XMMS plugin for GyachI
Group: Applications/Internet
@@ -107,8 +128,10 @@
%description plugin-xmms
XMMS plugin for GyachI
+%endif
+%if 0%{!?_without_libnotify:1}
%package plugin-libnotify
Summary: libnotify popup replacement
Group: Applications/Internet
@@ -117,13 +140,13 @@
%description plugin-libnotify
libnotify plugin for GyachI
+%endif
%package plugin-alsa
Summary: libalsa sound driver
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
-Buildrequires: libnotify-devel
BuildRequires: alsa-lib-devel >= 0.9
Requires: alsa-lib >= 0.9
@@ -136,7 +159,6 @@
Summary: pulseaudio sound driver
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
-
BuildRequires: pulseaudio-libs-devel
Requires: pulseaudio-libs
@@ -144,11 +166,11 @@
PulseAudio sound driver for gyachi
%endif
+
%package recre8-theme
Summary: GyachI Prototype theme
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
-#BuildArch: noarch
%description recre8-theme
%{summary} This package supplies the artwork for the GyachI recre8 theme.
@@ -163,11 +185,15 @@
./autogen.sh
%configure --disable-rpath --enable-v4l2 \
- --enable-plugin_photo_album \
- --enable-plugin_xmms \
- %{?_without_wine:--disable-wine} \
- %{?_without_pulseaudio:--disable-plugin_pulseaudio} \
- --libexecdir=%{_libexecdir}/gyachi
+ --libexecdir=%{_libexecdir}/gyachi \
+ %{?_without_wine:--disable-wine} \
+ %{?_without_gpgme:--disable-plugin_gpgme} \
+ %{?_without_pulseaudio:--disable-plugin_pulseaudio} \
+ %{?_without_libnotify:--disable-plugin_libnotify} \
+ --enable-plugin_photo_album \
+ %{!?_without_xmms:--enable-plugin_xmms}
+
+
make %{?_smp_mflags}
@@ -211,9 +237,11 @@
%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/%{name}blowfish.so
+%if 0%{!?_without_gpgme:1}
%files plugin-gpgme
%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/%{name}gpgme.so
+%endif
%files plugin-mcrypt
%defattr(-,root,root,-)
@@ -223,13 +251,17 @@
%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/%{name}photos.so
+%if 0%{!?_without_xmms:1}
%files plugin-xmms
%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/%{name}xmms.so
+%endif
+%if 0%{!?_without_libnotify:1}
%files plugin-libnotify
%defattr(-,root,root,-)
%{_libdir}/%{name}/plugins/%{name}libnotify.so
+%endif
%files plugin-alsa
%defattr(-,root,root,-)
@@ -254,6 +286,20 @@
%changelog
+* Tue Jul 8 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-15
+- plugin-photo_album obsoletes plugin-photosharing
+
+* Thu Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-12
+- Changed jasper-libs back to jasper for el4/el5
+
+* Fri Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-8
+- disabled libnotify, gpgme for RHEL4, changed libXt-devel and
+- libtool-ltdl-devel for RHEL4
+
+* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-7
+- disabled xmms plugin for rhel, pulseaudio for EL4/EL5
+- removed a gnu extension strchrnul in theme_support.c
+
* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-6
- Made Alsa driver a plugin, added pulseaudio support as a plugin.
- Disabled pulseaudio plugin for F7
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Jun 2008 17:23:21 -0000 1.4
+++ sources 8 Jul 2008 13:02:11 -0000 1.5
@@ -1 +1,2 @@
706d8e06a61b350babd7631337f57ccb gyachi-1.1.35.tar.gz
+b384371c4771d0ebe0e92ca86cdc4920 theme_support.patch
More information about the fedora-extras-commits
mailing list