diff --git a/.gitignore b/.gitignore index fae3207..73cf02c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -gnumeric-1.10.0.tar.bz2 +gnumeric-1.10.2.tar.bz2 +gnumeric-1.10.8.tar.bz2 diff --git a/gnumeric.spec b/gnumeric.spec index 63675a6..725439c 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -1,7 +1,7 @@ Name: gnumeric Epoch: 1 -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.10.8 +Release: 1%{?dist} Summary: Spreadsheet program for GNOME Group: Applications/Productivity # bug filed upstream about this being GPL v2 only: @@ -20,9 +20,9 @@ BuildRequires: python-devel guile-devel perl(XML::Parser) scrollkeeper BuildRequires: gettext desktop-file-utils perl(ExtUtils::Embed) intltool Requires: scrollkeeper hicolor-icon-theme Requires(pre): GConf2 -Requires(post): /sbin/ldconfig GConf2 scrollkeeper +Requires(post): /sbin/ldconfig GConf2 Requires(preun): GConf2 -Requires(postun): /sbin/ldconfig scrollkeeper +Requires(postun): /sbin/ldconfig %description Gnumeric is a spreadsheet program for the GNOME GUI desktop @@ -112,42 +112,31 @@ rm -rf $RPM_BUILD_ROOT %pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}*.schemas > /dev/null || : -fi +%gconf_schema_prepare %{name}-dialogs %{name}-general %{name}-plugins %post /sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -/usr/bin/gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}*.schemas > /dev/null || : -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%gconf_schema_upgrade %{name}-dialogs %{name}-general %{name}-plugins +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}*.schemas > /dev/null || : -fi +%gconf_schema_remove %{name}-dialogs %{name}-general %{name}-plugins %postun /sbin/ldconfig -scrollkeeper-update -q || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_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 || : + + %files -f %{name}.lang %defattr(-,root,root,-) %doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING @@ -189,6 +178,11 @@ fi %changelog +* Sat Aug 07 2010 Julian Sikorski - 1:1.10.8-1 +- Updated to 1.10.8 +- Dropped scrollkeeper scriptlets since they are no longer needed +- Updated icon cache and gconf scriptlets to the latest spec + * Thu Aug 05 2010 Julian Sikorski - 1:1.10.0-2 - Rebuilt for goffice 0.8.8 - Switched to wildcards for goffice plugin path diff --git a/sources b/sources index d30c225..f54d8eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45ca0c86d41288c1e70b25b74f5cd548 gnumeric-1.10.0.tar.bz2 +6a14ffd4f6ba34effea71a8831f058f3 gnumeric-1.10.8.tar.bz2