rpms/GConf2/devel GConf2.spec, 1.68, 1.69 system-settings.patch, 1.1, NONE

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10123

Modified Files:
	GConf2.spec 
Removed Files:
	system-settings.patch 
Log Message:
- Add the system-wide settings location in post to be more
  upgrade friendly (config file is noreplace)



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- GConf2.spec	3 Nov 2007 20:12:10 -0000	1.68
+++ GConf2.spec	16 Nov 2007 19:10:56 -0000	1.69
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
@@ -34,9 +34,6 @@
 Patch3: dir-leak.patch 
 Patch4: dead-leak.patch 
 
-# Add system-wide settings location
-Patch5: system-settings.patch
-
 %description
 GConf is a process-transparent configuration database API used to 
 store user preferences. It has pluggable backends and features to 
@@ -75,7 +72,6 @@
 %patch2 -p1 -b .sync-leak
 %patch3 -p1 -b .dir-leak
 %patch4 -p1 -b .dead-leak
-%patch5 -p1 -b .system-settings
 
 %build
 rm -f libtool
@@ -88,20 +84,28 @@
 rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.defaults
-#chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.mandatory
+#chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults
+#chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.mandatory
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/GConf/2/*.la
 
 %find_lang %name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+
+if [ $1 -gt 1 ]; then
+    if ! fgrep -q gconf.xml.system %{_sysconfdir}/gconf/2/path; then
+        sed -i -e 's at xml:readwrite:$(HOME)/.gconf@&\n\n# Location for system-wide settings.\nxml:readonly:/etc/gconf/gconf.xml.system@' %{_sysconfdir}/gconf/2/path
+    fi
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -138,6 +142,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Nov 16 2007 Ray Strode <rstrode at redhat.com> - 2.20.1-3
+- Add the system-wide settings location in post to be more
+  upgrade friendly (config file is noreplace)
+
 * Sun Nov 3 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-2
 - Add a location for system-wide settings
 


--- system-settings.patch DELETED ---