rpms/gnome-utils/devel gnome-utils.spec,1.183,1.184

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32607

Modified Files:
	gnome-utils.spec 
Log Message:
fix schema installation



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gnome-utils.spec	3 Feb 2009 06:11:39 -0000	1.183
+++ gnome-utils.spec	15 Feb 2009 02:04:31 -0000	1.184
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.25.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -173,7 +173,7 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
-	%{_sysconfdir}/gconf/schemas/logview.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
 	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
 	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
 	%{_sysconfdir}/gconf/schemas/baobab.schemas \
@@ -185,26 +185,22 @@
 
 %pre
 if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
-	%{_sysconfdir}/gconf/schemas/logview.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
-	%{_sysconfdir}/gconf/schemas/baobab.schemas \
-		>& /dev/null || :
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do 
+    if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
+      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$f >& /dev/null || :
+    fi
+  done
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
-	%{_sysconfdir}/gconf/schemas/logview.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
-	%{_sysconfdir}/gconf/schemas/baobab.schemas \
-		>& /dev/null || :
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  for f in gnome-dictionary.schemas logview.schemas gnome-system-log.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas; do 
+    if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
+      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$f >& /dev/null || :
+    fi
+  done
 fi
 
 %postun
@@ -274,6 +270,9 @@
 
 
 %changelog
+* Sat Feb 14 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.90-3
+- Install the right gconf schemas
+
 * Tue Feb  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.90-2
 - Update to 2.25.90