comparison gaim.spec.in @ 13747:69d5cd3d0b4a

[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 c4a5d8950d8c
children 3e58b20cded3
comparison
equal deleted inserted replaced
13746:ae1849182c8f 13747:69d5cd3d0b4a
26 Source: %{name}-@VERSION@.tar.bz2 26 Source: %{name}-@VERSION@.tar.bz2
27 BuildRoot: %{_tmppath}/%{name}-%{version}-root 27 BuildRoot: %{_tmppath}/%{name}-%{version}-root
28 28
29 # Generic build requirements 29 # Generic build requirements
30 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext 30 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
31 %{?_with_avahi:BuildRequires: avahi-devel}
31 %{?_with_howl:BuildRequires: howl-devel} 32 %{?_with_howl:BuildRequires: howl-devel}
32 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h} 33 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
33 %{?_with_meanwhile:BuildRequires: meanwhile-devel} 34 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
34 %{?_with_gadugadu:BuildRequires: libgadu-devel} 35 %{?_with_gadugadu:BuildRequires: libgadu-devel}
35 %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h} 36 %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
59 BuildRequires: perl-XML-Parser 60 BuildRequires: perl-XML-Parser
60 BuildRequires: mozilla-nss-devel 61 BuildRequires: mozilla-nss-devel
61 %endif 62 %endif
62 %endif 63 %endif
63 64
64 %if 0%{?_with_howl:1} 65 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
65 %package bonjour 66 %package bonjour
66 Summary: Bonjour plugin for Gaim 67 Summary: Bonjour plugin for Gaim
67 Group: Applications/Internet 68 Group: Applications/Internet
68 Requires: gaim = %{epoch}:%{version} 69 Requires: gaim = %{epoch}:%{version}
69 %endif 70 %endif
119 unique features, such as perl scripting, TCL scripting and C plugins. 120 unique features, such as perl scripting, TCL scripting and C plugins.
120 121
121 Gaim is NOT affiliated with or endorsed by America Online, Inc., 122 Gaim is NOT affiliated with or endorsed by America Online, Inc.,
122 Microsoft Corporation, Yahoo! Inc., or ICQ Inc. 123 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
123 124
124 %if 0%{?_with_howl:1} 125 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
125 %description bonjour 126 %description bonjour
126 Bonjour plugin for Gaim 127 Bonjour plugin for Gaim
127 %endif 128 %endif
128 129
129 %if 0%{?_with_silc:1} 130 %if 0%{?_with_silc:1}
198 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la 199 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
199 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod 200 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
200 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' 201 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
201 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' 202 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
202 203
203 %if 0%{!?_with_howl:1} 204 %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
204 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so 205 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so
205 %endif 206 %endif
206 207
207 %if 0%{!?_with_silc:1} 208 %if 0%{!?_with_silc:1}
208 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libsilcgaim.so 209 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libsilcgaim.so
262 %if 0%{?_with_dbus:1} 263 %if 0%{?_with_dbus:1}
263 %{_libdir}/libgaim-client.so.* 264 %{_libdir}/libgaim-client.so.*
264 %{_datadir}/dbus-1/services/gaim.service 265 %{_datadir}/dbus-1/services/gaim.service
265 %endif 266 %endif
266 267
267 %if 0%{?_with_howl:1} 268 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
268 %files bonjour 269 %files bonjour
269 %defattr(-, root, root) 270 %defattr(-, root, root)
270 271
271 %{_libdir}/gaim/libbonjour.* 272 %{_libdir}/gaim/libbonjour.*
272 %endif 273 %endif
320 %if 0%{?_with_dbus:1} 321 %if 0%{?_with_dbus:1}
321 %{_libdir}/libgaim-client.so 322 %{_libdir}/libgaim-client.so
322 %endif 323 %endif
323 324
324 %changelog 325 %changelog
326 * Mon May 8 2006 <thekingant@users.sourceforge.net>
327 - Add --with avahi option to compile the gaim-bonjour package against
328 Avahi's Howl compatibility layer.
329
325 * Wed Mar 29 2006 <stu@nosnilmot.com> 330 * Wed Mar 29 2006 <stu@nosnilmot.com>
326 - Source RPM uses tar.bz2 now to save space 331 - Source RPM uses tar.bz2 now to save space
327 - Update BuildRequires for new intltool dependencies 332 - Update BuildRequires for new intltool dependencies
328 - Add a --with perlmakehack option to allow builds to succeed on RH9 333 - Add a --with perlmakehack option to allow builds to succeed on RH9
329 - Add a --with gadugadu to build (separate) gaim-gadugadu package 334 - Add a --with gadugadu to build (separate) gaim-gadugadu package