rpms/gyachi/EL-5 gyachi.spec,1.8,1.9
Gregory D Hosler (ghosler)
fedora-extras-commits at redhat.com
Thu Jun 26 12:58:49 UTC 2008
Author: ghosler
Update of /cvs/pkgs/rpms/gyachi/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13200
Modified Files:
gyachi.spec
Log Message:
Changed jasper-libs back to jasper for el4/el5
Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/gyachi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gyachi.spec 19 Jun 2008 15:13:56 -0000 1.8
+++ gyachi.spec 26 Jun 2008 12:57:59 -0000 1.9
@@ -6,13 +6,18 @@
%define _without_pulseaudio 1
%endif
+%if 0%{?el4}
+%define _without_gpgme 1
+%define _without_libnotify 1
+%endif
+
%if 0%{?rhel}
%define _without_xmms 1
%endif
Name: gyachi
Version: 1.1.35
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A Yahoo! chat client with Webcam and voice support
Group: Applications/Internet
@@ -26,9 +31,17 @@
BuildRequires: autoconf automake gawk sed
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
@@ -36,7 +49,7 @@
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
@@ -72,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
@@ -80,6 +94,7 @@
%description plugin-gpgme
GPGMe encryption plugin for GyachI
+%endif
%package plugin-mcrypt
@@ -115,6 +130,7 @@
%endif
+%if 0%{!?_without_libnotify:1}
%package plugin-libnotify
Summary: libnotify popup replacement
Group: Applications/Internet
@@ -123,6 +139,7 @@
%description plugin-libnotify
libnotify plugin for GyachI
+%endif
%package plugin-alsa
@@ -169,7 +186,9 @@
%configure --disable-rpath --enable-v4l2 \
--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}
@@ -217,9 +236,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,-)
@@ -235,9 +256,11 @@
%{_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,-)
@@ -262,7 +285,14 @@
%changelog
-* Mon Jun 16 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-11
+* Thu Jun 206 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
More information about the fedora-extras-commits
mailing list