rpms/GConf2/devel system-settings.patch, NONE, 1.1 GConf2.spec, 1.67, 1.68
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sat Nov 3 20:12:44 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15324
Modified Files:
GConf2.spec
Added Files:
system-settings.patch
Log Message:
Add a location for system-wide non-default settings
system-settings.patch:
--- NEW FILE system-settings.patch ---
diff -up GConf-2.20.1/Makefile.am.system-settings GConf-2.20.1/Makefile.am
--- GConf-2.20.1/Makefile.am.system-settings 2007-11-03 16:00:34.000000000 -0400
+++ GConf-2.20.1/Makefile.am 2007-11-03 16:01:13.000000000 -0400
@@ -21,6 +21,8 @@ install-data-local:
-chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
-mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
-chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
+ -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.system
+ -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.system
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gconf-2.0.pc
diff -up GConf-2.20.1/gconf/default.path.in.system-settings GConf-2.20.1/gconf/default.path.in
--- GConf-2.20.1/gconf/default.path.in.system-settings 2007-11-03 15:57:35.000000000 -0400
+++ GConf-2.20.1/gconf/default.path.in 2007-11-03 15:59:04.000000000 -0400
@@ -20,6 +20,9 @@ include "$(HOME)/.gconf.path"
# Give users a default storage location, ~/.gconf
xml:readwrite:$(HOME)/.gconf
+# Location for system-wide settings.
+xml:readonly:@sysgconfdir@/gconf.xml.system
+
# To read in any defaults settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick default values
# system-wide in this file.
Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- GConf2.spec 15 Oct 2007 19:07:07 -0000 1.67
+++ GConf2.spec 3 Nov 2007 20:12:10 -0000 1.68
@@ -5,7 +5,7 @@
Summary: A process-transparent configuration system
Name: GConf2
Version: 2.20.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Base
Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
@@ -34,6 +34,9 @@
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
@@ -72,6 +75,7 @@
%patch2 -p1 -b .sync-leak
%patch3 -p1 -b .dir-leak
%patch4 -p1 -b .dead-leak
+%patch5 -p1 -b .system-settings
%build
rm -f libtool
@@ -84,8 +88,8 @@
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
@@ -110,6 +114,7 @@
%dir %{_sysconfdir}/gconf/2
%dir %{_sysconfdir}/gconf/gconf.xml.defaults
%dir %{_sysconfdir}/gconf/gconf.xml.mandatory
+%dir %{_sysconfdir}/gconf/gconf.xml.system
%dir %{_sysconfdir}/gconf/schemas
%{_bindir}/*
%{_libexecdir}/gconfd-2
@@ -133,6 +138,9 @@
%{_libdir}/pkgconfig/*
%changelog
+* Sun Nov 3 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-2
+- Add a location for system-wide settings
+
* Mon Oct 15 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-1
- 2.20.1 (translation and documentation updates)
More information about the fedora-extras-commits
mailing list