[gnumeric/el6] Revert "- Updated to 1.10.8"

[Lubomir Rintel]

commit 815f19dd29237b699c24e02b1ab688f9a9709209
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Thu Mar 14 14:45:26 2013 +0100

    Revert "- Updated to 1.10.8"
    
    Make this build without newer macros, keep the version.
    This reverts commit 9aeb7cb1bc3b5f71cd0a704ffe82ee57e4423c55.
    
    Conflicts:
    
    	.gitignore
    	gnumeric.spec
    	sources

 gnumeric.spec |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)
---
diff --git a/gnumeric.spec b/gnumeric.spec
index 31a28cb..1b1d83a 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.10.10
-Release:          2%{?dist}
+Release:          2%{?dist}.1
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -107,31 +107,42 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%gconf_schema_prepare %{name}-dialogs %{name}-general %{name}-plugins
+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
 
 
 %post
 /sbin/ldconfig
-%gconf_schema_upgrade %{name}-dialogs %{name}-general %{name}-plugins
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+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
 
 
 %preun
-%gconf_schema_remove %{name}-dialogs %{name}-general %{name}-plugins
+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
 
 
 %postun
 /sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+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 || :
 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
@@ -173,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Mar 14 2013 Lubomir Rintle <lkundrak at v3.sk> - 1:1.10.10-2.1
+- Make it install without new RPM macros
+
 * Thu Sep 16 2010 Julian Sikorski <belegdol at fedoraproject.org> - 1:1.10.10-2
 - Don't overwrite a good icon with an ancient one (RH #634582)