Hello community, here is the log from the commit of package gconf2 checked in at Tue Mar 11 18:54:46 CET 2008. -------- --- GNOME/gconf2/gconf2.changes 2008-01-31 21:29:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2/gconf2.changes 2008-03-11 18:28:39.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 11 18:25:56 CET 2008 - sbrabec@suse.cz + +- Added /etc/gconf/gconf.xml.vendor for branding and vendor + specific settings. +- Clean-up orphan /etc/opt/gnome/gconf/schemas on update. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.Q17398/_old 2008-03-11 18:54:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Q17398/_new 2008-03-11 18:54:41.000000000 +0100 @@ -10,6 +10,7 @@ # norootforbuild + Name: gconf2 BuildRequires: gtk-doc gtk2-devel indent intltool libidl-devel libxml2-devel openssl-devel orbit2-devel sgml-skel update-desktop-files Url: http://www.gnome.org/ @@ -19,12 +20,15 @@ PreReq: /bin/mkdir /bin/mv /bin/rm /bin/rmdir /bin/ln /bin/chmod AutoReqProv: on Version: 2.21.90 -Release: 1 +Release: 16 Summary: The GNOME 2.x Desktop Configuration Database System Source: ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.20/%{_name}-%{version}.tar.bz2 +# Generic tool, not upstreamed: Source1: gconftool-rebuild +# RPM specific macros: Source2: macros.gconf2 Patch0: gconf2-predictable-filenames.patch +# Include sabayon paths to the default configuration. Simplifies scriptlets: Patch2: gconf2-gconftool-reload.patch Patch3: gconf-schemas-path.patch Patch4: gconf2-sabayon.patch @@ -79,14 +83,11 @@ %patch3 %patch4 cp -a %{S:1} %{S:2} . -# XXX: correct? -#rm po/no.* -#sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in %build autoreconf -f -i # needed for GConf-2.14.0: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --libexecdir=%{_prefix}/lib/GConf/2\ --disable-static @@ -98,6 +99,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.mandatory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.schemas +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults install gconftool-rebuild $RPM_BUILD_ROOT%{_bindir} echo xml::%{_sysconfdir}/gconf/gconf.xml.schemas >$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schema-install-source @@ -116,7 +118,7 @@ mv -T etc/opt/gnome/gconf/gconf.xml.schemas etc/gconf/gconf.xml.schemas || : else # We update from old product with mixed gconf.xml.defaults (<=10.1) -# Then move this to the new location. gconf.xml.defaults os now reserved +# Then move this to the new location. gconf.xml.defaults is now reserved # for local customizations. (#166223) mv -T etc/opt/gnome/gconf/gconf.xml.defaults etc/gconf/gconf.xml.schemas || : fi @@ -125,6 +127,11 @@ if test -d etc/opt/gnome/gconf/gconf.xml.mandatory ; then mv -T etc/opt/gnome/gconf/gconf.xml.mandatory etc/gconf/gconf.xml.mandatory || : fi +# Remove probably obsolete /etc/opt/gnome/gconf/schemas and above. +# Needed only for old->10.3->11.0 update scenario (now fixed in opt_gnome-compat). +rmdir --ignore-fail-on-non-empty etc/opt/gnome/gconf/schemas 2>/dev/null || : +rmdir --ignore-fail-on-non-empty etc/opt/gnome/gconf 2>/dev/null || : +rmdir --ignore-fail-on-non-empty etc/opt/gnome 2>/dev/null || : # Remove obsolete and orphan directories (since 9.1, *gnome2* since 9.0). rm -rf\ etc/sysconfig/gconf2\ @@ -187,6 +194,7 @@ %dir %{_sysconfdir}/gconf/schemas %dir %{_sysconfdir}/gconf/gconf.xml.defaults %dir %{_sysconfdir}/gconf/gconf.xml.mandatory +%dir %{_sysconfdir}/gconf/gconf.xml.vendor %dir %{_sysconfdir}/gconf/gconf.xml.schemas %{_sysconfdir}/gconf/schema-install-source %config %{_sysconfdir}/gconf/2 @@ -207,6 +215,10 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Mar 11 2008 sbrabec@suse.cz +- Added /etc/gconf/gconf.xml.vendor for branding and vendor + specific settings. +- Clean-up orphan /etc/opt/gnome/gconf/schemas on update. * Thu Jan 31 2008 maw@suse.de - Update to version 2.21.90: + Don't use deprecated functions. ++++++ gconf-schemas-path.patch ++++++ --- /var/tmp/diff_new_pack.Q17398/_old 2008-03-11 18:54:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Q17398/_new 2008-03-11 18:54:41.000000000 +0100 @@ -1,6 +1,6 @@ ---- gconf/default.path.in.orig 2007-02-16 19:57:47.837148000 +0100 -+++ gconf/default.path.in 2007-02-16 19:59:06.841065000 +0100 -@@ -25,8 +25,9 @@ +--- gconf/default.path.in ++++ gconf/default.path.in +@@ -25,8 +25,12 @@ # system-wide in this file. include @sysgconfdir@/2/local-defaults.path @@ -8,7 +8,9 @@ +# Then look at the systemwide customizations xml:readonly:@sysgconfdir@/gconf.xml.defaults -- ++# Then check vendor preferences ++xml:readonly:@sysgconfdir@/gconf.xml.vendor + +# And finally look at the defaults defined by installed schemas +xml:readonly:@sysgconfdir@/gconf.xml.schemas ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org