commit gconf2 for openSUSE:Factory

6 May 2009

Hello community,

here is the log from the commit of package gconf2 for openSUSE:Factory
checked in at Wed May 6 18:38:58 CEST 2009.



--------

--- GNOME/gconf2/gconf2.changes	2009-03-17 10:58:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/gconf2/gconf2.changes	2009-04-28 14:10:50.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Apr 28 11:52:06 CEST 2009 - vuntz@novell.com
+
+- Change the rpm gconf macros to move the .schemas files of
+  packages built with those macros from /etc/gconf/macros to
+  /usr/share/gconf/macros.
+  This implements fate#305318.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gconf2.spec ++++++
--- /var/tmp/diff_new_pack.j20247/_old	2009-05-06 18:38:47.000000000 +0200
+++ /var/tmp/diff_new_pack.j20247/_new	2009-05-06 18:38:47.000000000 +0200
@@ -32,7 +32,7 @@
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/GUI/GNOME
 Version:        2.26.0
-Release:        1
+Release:        2
 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:
@@ -100,7 +100,7 @@
 %install
 %makeinstall
 # Empty dir for schemas.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/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.system
@@ -120,6 +120,8 @@
 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 || :
+# FIXME: remove this section for 12.2 (we deprecated /etc/gconf/schemas in favor if /usr/share/gconf/schemas during development of 11.2)
+rmdir --ignore-fail-on-non-empty etc/gconf/schemas 2>/dev/null || :
 
 %post
 /sbin/ldconfig
@@ -142,7 +144,8 @@
 # customization).
 # WARNING: If this package will be renamed to gconf and upgraded from <=9.0,
 # the directory /etc/opt/gnome/gconf will be deleted by mistake.
-if test $1 = 0 -a ! -d etc/gconf/schemas ; then
+# FIXME: remove test for etc/gconf/schemas for 12.2
+if test $1 = 0 -a ! \( -d etc/gconf/schemas -o -d usr/share/gconf/schemas \) ; then
     rm -rf etc/gconf/gconf.xml.schemas
 fi
 
@@ -169,8 +172,9 @@
 %{_prefix}/lib/GConf/2/gconf-defaults-mechanism
 %doc %{_mandir}/man?/*.*
 %{_sysconfdir}/dbus-1/system.d/*.conf
+%dir %{_datadir}/gconf
+%dir %{_datadir}/gconf/schemas
 %dir %{_sysconfdir}/gconf
-%dir %{_sysconfdir}/gconf/schemas
 %dir %{_sysconfdir}/gconf/gconf.xml.defaults
 %dir %{_sysconfdir}/gconf/gconf.xml.mandatory
 %dir %{_sysconfdir}/gconf/gconf.xml.vendor
@@ -191,6 +195,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Apr 28 2009 vuntz@novell.com
+- Change the rpm gconf macros to move the .schemas files of
+  packages built with those macros from /etc/gconf/macros to
+  /usr/share/gconf/macros.
+  This implements fate#305318.
 * Tue Mar 17 2009 mboman@suse.de
 - Update to version 2.26.0:
   + Correct url to gconf website
@@ -258,7 +267,7 @@
 * Fri Jan 23 2009 vuntz@novell.com
 - Drop gconf2-predictable-filenames.patch: this was fixed another
   way upstream.
-* Sun Jan 11 2009 mboman@suse.de
+* Mon Jan 12 2009 mboman@suse.de
 - Update to version 2.25.0:
   + Fix various format string warnings
   + Sync saved state to disk before closing
@@ -282,7 +291,7 @@
 * Tue Jun 24 2008 mauro@suse.de
 - Updated requirements for the -devel package in the spec (a package
   in the requirements changed it name to dbus-1-glib-devel).
-* Fri Jun 06 2008 maw@suse.de
+* Sat Jun 07 2008 maw@suse.de
 - Update to version 2.23.1:
   + Stop spamming syslog
   + Signal handling fixes
@@ -430,7 +439,7 @@
 - Remove upstreamed sentinel patch
 * Mon Jul 11 2005 sbrabec@suse.cz
 - Removed unneeded static modules and .la files for modules.
-* Thu Jun 16 2005 gekker@suse.de
+* Fri Jun 17 2005 gekker@suse.de
 - Fix sentinel patch to work with new glib2.
 * Tue Jun 07 2005 gekker@suse.de
 - Update to version 2.11.1.
@@ -449,7 +458,7 @@
   (non numeric if arguments need quoting)
 * Fri Nov 19 2004 gekker@suse.de
 - Update to version 2.8.1
-* Fri Oct 29 2004 ro@suse.de
+* Sat Oct 30 2004 ro@suse.de
 - locale rename: no -> nb
 * Tue Oct 12 2004 sbrabec@suse.cz
 - Fixed libexecdir for bi-arch (#47050).

++++++ gconftool-rebuild ++++++
--- /var/tmp/diff_new_pack.j20247/_old	2009-05-06 18:38:47.000000000 +0200
+++ /var/tmp/diff_new_pack.j20247/_new	2009-05-06 18:38:47.000000000 +0200
@@ -54,19 +54,34 @@
 umask 0022
 mkdir$VERBOSE $GCONF_SCHEMAS_DIR
 shopt -s nullglob
-cd /etc/gconf/schemas
+cd /usr/share/gconf/schemas
 
 vecho ""
 vecho "Installing database entries from schemas..."
-eval "(/bin/ls /etc/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE"
+eval "(/bin/ls /usr/share/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE"
 
 vecho ""
 vecho "Installing database entries from entries..."
-for SCHEMAS in /etc/gconf/schemas/*.entries ; do
+for SCHEMAS in /usr/share/gconf/schemas/*.entries ; do
     eval /usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load $SCHEMAS$UNVERBOSE
 done
 
-# /opt/gnome for compatibility with old packages (<=OpenSUSE 10.2 and SLED10)
+# /etc/gconf/schemas for compatibility with old packages (<=openSUSE 11.1 and SLED11), can be removed for 12.2
+if test -d /etc/gconf/schemas ; then
+    cd /etc/gconf/schemas
+
+    vecho ""
+    vecho "Installing database entries from schemas..."
+    eval "(/bin/ls /etc/gconf/schemas/*.schemas | xargs /usr/bin/gconftool-2 --makefile-install-rule) $UNVERBOSE"
+
+    vecho ""
+    vecho "Installing database entries from entries..."
+    for SCHEMAS in /etc/gconf/schemas/*.entries ; do
+        eval /usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load $SCHEMAS$UNVERBOSE
+    done
+fi
+
+# /opt/gnome for compatibility with old packages (<=OpenSUSE 10.2 and SLED10), can be removed for 11.3
 if test -d /etc/opt/gnome/gconf/schemas ; then
     cd /etc/opt/gnome/gconf/schemas
 

++++++ macros.gconf2 ++++++
--- /var/tmp/diff_new_pack.j20247/_old	2009-05-06 18:38:47.000000000 +0200
+++ /var/tmp/diff_new_pack.j20247/_new	2009-05-06 18:38:47.000000000 +0200
@@ -54,8 +54,8 @@
 if test "x$INSTALL_SCHEMA_FILES" != "x"; then\
     usr/bin/gconftool-2 --makefile-install-rule $INSTALL_SCHEMA_FILES >/dev/null\
 fi\
-rmdir etc/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_posttrans\
-echo '    rmdir etc/gconf/schemas/outdated 2>/dev/null || true\
+rmdir usr/share/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_posttrans\
+echo '    rmdir usr/share/gconf/schemas/outdated 2>/dev/null || true\
 fi' >>$GCONF_SCHEMAS_NAME.schemas_preun\
 %{nil}
 
@@ -65,7 +65,7 @@
 fi\
 GCONF_SCHEMAS_NAME=%1\
 echo '%defattr (644, root, root, 755)' >%1.schemas_list\
-echo 'mkdir -p etc/gconf/schemas/outdated' >%1.schemas_pre\
+echo 'mkdir -p usr/share/gconf/schemas/outdated' >%1.schemas_pre\
 echo 'export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`\
 INSTALL_SCHEMA_FILES=\
 UNINSTALL_SCHEMA_FILES=' >%1.schemas_posttrans\
@@ -78,40 +78,52 @@
 %_add_gconf_schemas() \
 echo $SCHEMAS >>$GCONF_SCHEMAS_NAME.schemas_list\
 echo "if test -f ${SCHEMAS#/} ; then\
-    ln -f ${SCHEMAS#/} etc/gconf/schemas/outdated/\
+    ln -f ${SCHEMAS#/} usr/share/gconf/schemas/outdated/\
+else\
+    # Migration from /etc/gconf/schemas to /usr/share/gconf/schemas. Can be removed for openSUSE 12.2\
+    if test -f etc/gconf/schemas/${SCHEMAS#/usr/share/gconf/schemas/} ; then\
+        # We do cp instead of ln since /usr and /etc might be on different partitions\
+        cp etc/gconf/schemas/${SCHEMAS#/usr/share/gconf/schemas/} usr/share/gconf/schemas/outdated/\
+    fi\
 fi" >>$GCONF_SCHEMAS_NAME.schemas_pre\
-echo "if test -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}; then\
-    cmp --quiet etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} ${SCHEMAS#/}\
+echo "if test -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}; then\
+    cmp --quiet usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} ${SCHEMAS#/}\
     if test \\\$? != 0; then\
-        UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\\\"\
+        UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}\\\"\
         INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\
     else\
-        rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\
+        rm -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}\
     fi\
 else\
   INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\
 fi" >>$GCONF_SCHEMAS_NAME.schemas_posttrans\
 echo "    if test -x usr/bin/gconftool-2 ; then\
-        if test -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} ; then\
-            usr/bin/gconftool-2 --makefile-uninstall-rule etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} >/dev/null\
+        if test -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} ; then\
+            usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/} >/dev/null\
         elif test -f ${SCHEMAS#/} ; then\
             usr/bin/gconftool-2 --makefile-uninstall-rule ${SCHEMAS#/} >/dev/null\
         fi\
     fi\
-    rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\
+    rm -f usr/share/gconf/schemas/outdated/${SCHEMAS#/usr/share/gconf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\
 %{nil}
 
 %add_gconf_schemas() \
-SCHEMAS=/etc/gconf/schemas/%1.schemas\
+mkdir -p $RPM_BUILD_ROOT/usr/share/gconf/schemas\
+SCHEMAS=/usr/share/gconf/schemas/%1.schemas\
+mv $RPM_BUILD_ROOT/etc/gconf/schemas/%1.schemas ${RPM_BUILD_ROOT}${SCHEMAS}\
 %_add_gconf_schemas\
 %{nil}
 
 %find_gconf_schemas() \
 test -d $RPM_BUILD_ROOT/etc/gconf/schemas\
+mkdir -p $RPM_BUILD_ROOT/usr/share/gconf/schemas\
 %def_gconf_schemas %{name}\
 for SCHEMAS in $RPM_BUILD_ROOT/etc/gconf/schemas/*.schemas ; do\
     test -f $SCHEMAS\
-    SCHEMAS=${SCHEMAS#$RPM_BUILD_ROOT}\
+    SCHEMASFILENAME=${SCHEMAS#$RPM_BUILD_ROOT/etc/gconf/schemas/}\
+    NEWSCHEMAS=/usr/share/gconf/schemas/$SCHEMASFILENAME\
+    mv $SCHEMAS ${RPM_BUILD_ROOT}${NEWSCHEMAS}\
+    SCHEMAS=$NEWSCHEMAS\
     %_add_gconf_schemas\
 done\
 %end_gconf_schemas\


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)