Mercurial > pidgin.yaz
diff pidgin.spec.in @ 20423:85d131a53fa2
merge of 'b0a7fb13dafc5da577103e3aac205667caf2e6f2'
and 'f8c1a2570c084da24766533cd1f4a971eb2e6560'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 26 May 2007 12:49:57 +0000 |
| parents | 99a2add7c4f2 |
| children | 58a286e231b7 |
line wrap: on
line diff
--- a/pidgin.spec.in Sat May 26 12:49:49 2007 +0000 +++ b/pidgin.spec.in Sat May 26 12:49:57 2007 +0000 @@ -29,7 +29,6 @@ BuildRequires: gtk2-devel %{!?_without_startupnotification:BuildRequires: startup-notification-devel} -%{!?_without_modularx:BuildRequires: libSM-devel, libXScrnSaver-devel} %{?_with_avahi:BuildRequires: avahi-compat-howl-devel} %{!?_without_gtkspell:BuildRequires: gtkspell-devel} %{?_with_howl:BuildRequires: howl-devel} @@ -55,7 +54,10 @@ # For Mandrake/Mandriva: BuildRequires: libnss3-devel, perl-devel Obsoletes: libgaim-remote0 +%{!?_without_modularx:BuildRequires: libsm-devel, libxscrnsaver-devel} %else +# For !Mandriva +%{!?_without_modularx:BuildRequires: libSM-devel, libXScrnSaver-devel} # For SuSE, Red Hat, Fedora and others: %if "%{_vendor}" != "suse" # For Red Hat, Fedora and others: @@ -312,7 +314,7 @@ killall -HUP gconfd-2 &> /dev/null || : fi touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : %post -n libpurple -p /sbin/ldconfig @@ -328,7 +330,7 @@ %postun touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &> /dev/null || : %postun -n libpurple -p /sbin/ldconfig @@ -447,6 +449,11 @@ %endif %changelog +* Thu May 24 2007 Stu Tomlinson <stu@nosnilmot.com> +- Silence errors from gtk-update-icon-cache +- Change Mandriva build dependencies to reflect the correct (lower case) + names for libSM-devel & libXScrnSaver-devel (Sunny Dubey) + * Thu May 10 2007 Stu Tomlinson <stu@nosnilmot.com> - Add scriptlet Requires for GConf2 to fix schema installation - Silence harmless errors when gconfd-2 is not running at install time