- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
(see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)
This commit is contained in:
parent
e61c454298
commit
fcf08e55bc
@ -11,7 +11,6 @@
|
||||
%define last_libgal2_version 2:2.5.3-2
|
||||
%define libgweather_version 2.25.4
|
||||
%define pilot_link_version 2:0.12.1
|
||||
%define scrollkeeper_version 0.1.4
|
||||
%define soup_version 2.2.2
|
||||
|
||||
%define evo_major 2.30
|
||||
@ -69,9 +68,6 @@ Requires(pre): GConf2
|
||||
Requires(post): GConf2
|
||||
Requires(preun): GConf2
|
||||
|
||||
Requires(post): scrollkeeper >= %{scrollkeeper_version}
|
||||
Requires(postun): scrollkeeper >= %{scrollkeeper_version}
|
||||
|
||||
# Don't trust evolution-data-server to maintain accurate sonames.
|
||||
Requires: evolution-data-server >= %{version}
|
||||
|
||||
@ -352,9 +348,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
|
||||
$RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so
|
||||
%endif
|
||||
|
||||
# scrollkeeper gets handled in %post
|
||||
rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
|
||||
|
||||
@ -383,9 +376,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plu
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
scrollkeeper-update -q
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || :
|
||||
@ -424,9 +415,13 @@ fi
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
scrollkeeper-update -q
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
if [ $1 -eq 0 ] ; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -680,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Dec 22 2009 Matthew Barnes <mbarnes@redhat.com> - 2.29.4-2.fc13
|
||||
- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
|
||||
(see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)
|
||||
|
||||
* Mon Dec 21 2009 Milan Crha <mcrha@redhat.com> - 2.29.4-1.fc13
|
||||
- Update to 2.29.4
|
||||
- Remove patch for missing m4 files from tarball (fixed upstream).
|
||||
|
Loading…
Reference in New Issue
Block a user