- put conf files in /etc/%%{name} instead of /etc/%%{name}/%%{name}

[packages/GConf2.git] / GConf2-path.patch

diff --git a/GConf2-path.patch b/GConf2-path.patch
index a5dfcb36109a3ed7b814da8b033aa73b88535ffa..b0498f31279d7d6fdf97b35eba570b08a8df129c 100644 (file)
--- a/GConf2-path.patch
+++ b/GConf2-path.patch
@@ -1,19 +1,21 @@
-diff -Nur GConf-1.2.1/gconf/default.path.in GConf-1.2.1-new/gconf/default.path.in
---- GConf-1.2.1/gconf/default.path.in  Mon Jan 31 21:49:05 2000
-+++ GConf-1.2.1-new/gconf/default.path.in      Thu Aug 29 12:41:18 2002
-@@ -8,6 +8,7 @@
- # Look first in systemwide mandatory settings directory
+diff -urN GConf-1.2.1.orig/gconf/default.path.in GConf-1.2.1/gconf/default.path.in
+--- GConf-1.2.1.orig/gconf/default.path.in     Fri Oct 18 23:46:43 2002
++++ GConf-1.2.1/gconf/default.path.in  Fri Oct 18 23:49:06 2002
+@@ -9,6 +9,9 @@
  # (commented out until xml backend knows how to be read-only for users)
  xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
-+xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.mandatory
  
++# Uncomment line below if GConf 1 is installed
++# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.mandatory
++
  # Now see where users want us to look - basically the user can stick arbitrary 
  # sources in a ~/.gconf.path file and they're inserted here
-@@ -20,6 +21,5 @@
- # Finally, look at the systemwide defaults
+ include "$(HOME)/.gconf.path"
+@@ -21,5 +24,6 @@
  # (commented out for now)
  xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
+ 
 -
--
-+xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.defaults
++# Uncomment line below if GConf 1 is installed
++# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.defaults