Mercurial > pidgin.yaz

changeset 13747:69d5cd3d0b4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16158] Add a "--with avahi" option to our RPM spec file. I think this should work, but I just got the following error and I want to go to sleep: /var/tmp/rpm-tmp.68399: line 39: syntax error: unexpected end of file error: Bad exit status from /var/tmp/rpm-tmp.68399 (%install) RPM build errors: /home/mark/rpmbuild/SPECS/gaim.spec:194: Got a %else with no %if Bad exit status from /var/tmp/rpm-tmp.68399 (%install) committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 08 May 2006 04:45:41 +0000
parents ae1849182c8f
children 3e58b20cded3
files gaim.spec.in
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gaim.spec.in	Mon May 08 04:32:21 2006 +0000
+++ b/gaim.spec.in	Mon May 08 04:45:41 2006 +0000
@@ -28,6 +28,7 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
+%{?_with_avahi:BuildRequires: avahi-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -61,7 +62,7 @@
 %endif
 %endif
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %package bonjour
 Summary:    Bonjour plugin for Gaim
 Group:      Applications/Internet
@@ -121,7 +122,7 @@
 Gaim is NOT affiliated with or endorsed by America Online, Inc.,
 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %description bonjour
 Bonjour plugin for Gaim
 %endif
@@ -200,7 +201,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
-%if 0%{!?_with_howl:1}
+%if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so
 %endif
 
@@ -264,7 +265,7 @@
 %{_datadir}/dbus-1/services/gaim.service
 %endif
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %files bonjour
 %defattr(-, root, root)
 
@@ -322,6 +323,10 @@
 %endif
 
 %changelog
+* Mon May 8 2006 <thekingant@users.sourceforge.net>
+- Add --with avahi option to compile the gaim-bonjour package against
+  Avahi's Howl compatibility layer.
+
 * Wed Mar 29 2006 <stu@nosnilmot.com>
 - Source RPM uses tar.bz2 now to save space
 - Update BuildRequires for new intltool dependencies