Hello community, here is the log from the commit of package sabayon checked in at Tue May 16 02:20:43 CEST 2006. -------- --- GNOME/sabayon/sabayon.changes 2006-05-03 06:58:28.000000000 +0200 +++ sabayon/sabayon.changes 2006-05-15 19:58:24.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 15 19:58:19 CEST 2006 - sbrabec@suse.cz + +- Do not own gconf files reserved for sysadmin (#167282). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sabayon.spec ++++++ --- /var/tmp/diff_new_pack.KFpNCk/_old 2006-05-16 02:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.KFpNCk/_new 2006-05-16 02:20:28.000000000 +0200 @@ -12,12 +12,12 @@ Name: sabayon Version: 2.12.3 -Release: 18 +Release: 21 Summary: Tool to maintain user profiles in a GNOME desktop Group: System/GUI/GNOME License: GPL URL: http://www.gnome.org/projects/sabayon/ -Source: http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.12/sabayon-%{version}.tar.bz2 BuildRequires: desktop-file-utils gettext gnome-common gnome-filesystem gnome-icon-theme gtk2-devel intltool python-cairo python-devel python-gnome python-gtk python-ldap shadow-utils update-desktop-files xorg-x11 xorg-x11-Xnest xorg-x11-devel %define gtk2_version 2.7.4 %define pygtk2_version 2.7.1 @@ -37,7 +37,7 @@ Requires: python-ldap Requires: python-gnome >= %{gnome_python2_version} Requires: python-cairo -PreReq: shadow-utils +PreReq: shadow-utils gconf2 grep PreReq: gtk2 >= %{gtk2_version} Patch1: sabayon-2.12.3-libxml2mod.patch Patch2: sabayon-2.12.3-python-site-modules-path.patch @@ -114,8 +114,6 @@ %makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{sysconfdir} mkdir -p $RPM_BUILD_ROOT%{sysconfdir}/gconf/2 -echo 'include "$(HOME)/.gconf.path.defaults"' > $RPM_BUILD_ROOT%{sysconfdir}/gconf/2/local-defaults.path -echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{sysconfdir}/gconf/2/local-mandatory.path mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d mv -f $RPM_BUILD_ROOT%{sysconfdir}/X11/xinit/xinitrc.d/%{name}* $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ rm -Rf $RPM_BUILD_ROOT%{sysconfgir}/X11 @@ -133,11 +131,60 @@ /usr/sbin/groupadd -r %{name}-admin &>/dev/null || : /usr/sbin/useradd -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin -d /var/lib/%{name}-admin %{name}-admin &>/dev/null || : +%post +# Support for not customized gconf2 package: +# Remove old sabayon local settings, if it has structured comments. +if test -f %{sysconfdir}/gconf/2/local-defaults.path ; then + if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-defaults.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-defaults.path + if ! test -s %{sysconfdir}/gconf/2/local-defaults.path ; then + rm %{sysconfdir}/gconf/2/local-defaults.path + fi + fi +fi +if test -f %{sysconfdir}/gconf/2/local-mandatory.path ; then + if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-mandatory.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-mandatory.path + if ! test -s %{sysconfdir}/gconf/2/local-mandatory.path ; then + rm %{sysconfdir}/gconf/2/local-mandatory.path + fi + fi +fi +# Include new sabayon local settings, only if gconf2 does not support it. +# WARNING: These files are removed during update from 10.0+supplementary. +# Never mind, new gconf2 contains these settings. +if ! fgrep -q 'include "$(HOME)/.gconf.path.defaults"' %{sysconfdir}/gconf/2/path ; then + echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.defaults"\n# END sabayon' >>%{sysconfdir}/gconf/2/local-defaults.path +fi +if ! fgrep -q 'include "$(HOME)/.gconf.path.mandatory"' %{sysconfdir}/gconf/2/path ; then + echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.mandatory"\n# END sabayon' >>%{sysconfdir}/gconf/2/local-mandatory.path +fi + +%postun +# Support for not customized gconf2 package: +# Remove old sabayon local settings on remove. +if test $1 = 0 ; then + if test -f %{sysconfdir}/gconf/2/local-defaults.path ; then + if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-defaults.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-defaults.path + if ! test -s %{sysconfdir}/gconf/2/local-defaults.path ; then + rm %{sysconfdir}/gconf/2/local-defaults.path + fi + fi + fi + if test -f %{sysconfdir}/gconf/2/local-mandatory.path ; then + if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-mandatory.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-mandatory.path + if ! test -s %{sysconfdir}/gconf/2/local-mandatory.path ; then + rm %{sysconfdir}/gconf/2/local-mandatory.path + fi + fi + fi +fi + %files -f sabayon.lang %defattr(-, root, root, 755) %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES -%config(noreplace) %{sysconfdir}/gconf/2/local-defaults.path -%config(noreplace) %{sysconfdir}/gconf/2/local-mandatory.path %config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}* %{sysconfdir}/desktop-profiles %{sbindir}/%{name}-apply @@ -182,6 +229,8 @@ %{python_sitelib}/%{name}/lockdown %changelog -n sabayon +* Mon May 15 2006 - sbrabec@suse.cz +- Do not own gconf files reserved for sysadmin (#167282). * Wed May 03 2006 - hpj@suse.de - Added patch to use gnome-vfs instead of gamin for file change monitoring (Novell bug #167621). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...