Mercurial > pidgin
diff pidgin.spec.in @ 23458:44159acb7bb7
propagate from branch 'im.pidgin.pidgin' (head 8da8d3c2a708d8bd00fe907d35de61998fb20125)
to branch 'im.pidgin.pidgin.khc.msnp15' (head 12d02c8d8c4cbee5a1f9c9aade905aca905c531d)
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 06 Mar 2008 04:19:53 +0000 |
parents | 4512cb14cf29 |
children | 18c3c7d8bdbd |
line wrap: on
line diff
--- a/pidgin.spec.in Wed Feb 27 04:49:37 2008 +0000 +++ b/pidgin.spec.in Thu Mar 06 04:19:53 2008 +0000 @@ -34,7 +34,6 @@ %{!?_without_startupnotification:BuildRequires: startup-notification-devel} %{?_with_avahi:BuildRequires: avahi-glib-devel} %{!?_without_gtkspell:BuildRequires: gtkspell-devel} -%{?_with_howl:BuildRequires: howl-devel} %{?_with_meanwhile:BuildRequires: meanwhile-devel} %{?_with_mono:BuildRequires: mono-devel} %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2} @@ -117,7 +116,7 @@ %{?_with_dbus:Requires: dbus-devel >= 0.35} %endif -%if 0%{?_with_howl:1} || 0%{?_with_avahi:1} +%if 0%{?_with_avahi:1} %package -n libpurple-bonjour Summary: Bonjour plugin for Pidgin Group: Applications/Internet @@ -184,7 +183,7 @@ documentation, and libraries required for development of libpurple based instant messaging clients or plugins for any libpurple based client. -%if 0%{?_with_howl:1} || 0%{?_with_avahi:1} +%if 0%{?_with_avahi:1} %description -n libpurple-bonjour Bonjour plugin for Pidgin. %endif @@ -261,7 +260,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} && 0%{!?_with_avahi:1} +%if 0%{!?_with_avahi:1} rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so %endif @@ -327,7 +326,9 @@ killall -HUP gconfd-2 &> /dev/null || : fi touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : +fi %post -n libpurple -p /sbin/ldconfig @@ -343,7 +344,9 @@ %postun touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : +fi %postun -n libpurple -p /sbin/ldconfig @@ -419,7 +422,7 @@ %endif -%if 0%{?_with_howl:1} || 0%{?_with_avahi:1} +%if 0%{?_with_avahi:1} %files -n libpurple-bonjour %defattr(-, root, root) @@ -465,6 +468,9 @@ %endif %changelog +* Thu Feb 28 2008 Stu Tomlinson <stu@nosnilmot.com> +- Remove --with-howl options as we no longer support using howl for bonjour + * Wed Dec 5 2007 Stu Tomlinson <stu@nosnilmot.com> - When building with avahi, use native avahi instead of howl compatability headers