Mercurial > pidgin
changeset 16746:c80d9dc41240
merge of '65b5bccbe0e6fa4f2c4894ecd8b53505171a44a0'
and '86b2c09b339f2037b3cd7fac5f16b910590a64e0'
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Tue, 01 May 2007 14:09:24 +0000 |
parents | b5d1826218aa (diff) 8f513f2b37d5 (current diff) |
children | 728785ce47b7 |
files | pidgin.spec.in |
diffstat | 1 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin.spec.in Tue May 01 06:03:44 2007 +0000 +++ b/pidgin.spec.in Tue May 01 14:09:24 2007 +0000 @@ -229,10 +229,9 @@ # Delete files that we don't want to put in any of the RPMs rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/purple/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/purple/liboscar.so -rm -f $RPM_BUILD_ROOT%{_libdir}/purple/libjabber.so -rm -f $RPM_BUILD_ROOT%{_libdir}/purple/private/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so +rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' @@ -291,9 +290,11 @@ %pre if [ "$1" -gt 1 -a -n "`which gconftool-2 2>/dev/null`" ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || : - killall -HUP gconfd-2 || : + if [ -f %{_sysconfdir}/gconf/schemas/purple.schemas ]; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || : + killall -HUP gconfd-2 || : + fi fi %post @@ -303,6 +304,8 @@ %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || : killall -HUP gconfd-2 || : fi +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %post -n libpurple -p /sbin/ldconfig @@ -316,6 +319,10 @@ killall -HUP gconfd-2 || : fi +%postun +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %postun -n libpurple -p /sbin/ldconfig %postun -n finch -p /sbin/ldconfig @@ -433,6 +440,11 @@ %endif %changelog +* Tue May 1 2007 Stu Tomlinson <stu@nosnilmot.com> +- Run gtk-update-icon-cache on installation/uninstallation +- Guard against errors when upgrading from Gaim/Pidgin 1.5.x which had + no schemas file + * Sun Apr 29 2007 Stu Tomlinson <stu@nosnilmot.com> - Update to reflect perl Purple::GtkUI -> Pidgin change