commit gconf2 for openSUSE:Factory

11 Mar 2009

Hello community,

here is the log from the commit of package gconf2 for openSUSE:Factory
checked in at Wed Mar 11 17:06:20 CET 2009.


--------

--- GNOME/gconf2/gconf2.changes	2009-02-23 12:49:18.000000000 +0100
+++ gconf2/gconf2.changes	2009-02-26 20:12:48.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Feb 26 19:57:17 CET 2009 - vuntz@novell.com
+
+- Update macros.gconf2 to have faster package upgrades:
+  + do only one gconftool-2 --makefile-install-rule for all the
+    schemas files, instead of multiple calls
+  + compare the old schema with the new one and if they are not
+    different, skip the --makefile-uninstall-rule and
+    --makefile-install-rule for it
+  + note: this adds a dependency on diffutils for all packages
+    shipping gconf schemas
+- Remove unneeded BuildRequires: openssl-devel
+- Remove Requires from devel package: popt-devel
+- Add a note about why we probably need to keep gconftool-rebuild
+  until 12.2
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


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

Other differences:
------------------
++++++ gconf2.spec ++++++
--- /var/tmp/diff_new_pack.uH5584/_old	2009-03-11 17:00:32.000000000 +0100
+++ /var/tmp/diff_new_pack.uH5584/_new	2009-03-11 17:00:32.000000000 +0100
@@ -25,7 +25,6 @@
 BuildRequires:  intltool
 BuildRequires:  libidl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  openssl-devel
 BuildRequires:  orbit2-devel
 BuildRequires:  update-desktop-files
 Url:            http://www.gnome.org/
@@ -35,7 +34,7 @@
 PreReq:         /bin/mkdir /bin/mv /bin/rm /bin/rmdir /bin/ln /bin/chmod
 AutoReqProv:    on
 Version:        2.25.2
-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:
@@ -67,7 +66,7 @@
 License:        GPL v2 or later; LGPL v2.1 or later
 Summary:        Include files and libraries mandatory for development
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version} orbit2-devel glib2-devel popt-devel dbus-1-glib-devel
+Requires:       %{name} = %{version} orbit2-devel glib2-devel dbus-1-glib-devel
 Obsoletes:      gconf2-doc <= %{version}
 Provides:       gconf2-doc = %{version}
 
@@ -123,7 +122,7 @@
 
 %post
 /sbin/ldconfig
-# FIXME: Consider removing the rest of this section for 11.3: ask sbrabec to be sure. (Checked my mboman@suse.de, 2009-02-21)
+# FIXME: Consider removing the rest of this section for 12.2:
 # If it is an update from SuSE Linux version causing orphan files,
 # avoid orphan GConf database keys. (#48114).
 # Worked-around by database rebuild from scratch after each update of
@@ -132,6 +131,7 @@
 # Since SuSE Linux 10.3, scriptlets are correct, but we have to provide
 # upgrade protection for third party packages with broken scriptlets
 # for a long time.
+# During openSUSE 11.2 development, we moved to a merged xml file.
 usr/bin/gconftool-rebuild
 
 %postun 
@@ -190,6 +190,19 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Feb 26 2009 vuntz@novell.com
+- Update macros.gconf2 to have faster package upgrades:
+  + do only one gconftool-2 --makefile-install-rule for all the
+  schemas files, instead of multiple calls
+  + compare the old schema with the new one and if they are not
+  different, skip the --makefile-uninstall-rule and
+    --makefile-install-rule for it
+  + note: this adds a dependency on diffutils for all packages
+  shipping gconf schemas
+- Remove unneeded BuildRequires: openssl-devel
+- Remove Requires from devel package: popt-devel
+- Add a note about why we probably need to keep gconftool-rebuild
+  until 12.2
 * Sun Feb 22 2009 vuntz@novell.com
 - Fix gconf2-schemas-path.patch again to have gconf.xml.defaults
   before "include @sysgconfdir@/2/local-defaults.path"

++++++ macros.gconf2 ++++++
--- /var/tmp/diff_new_pack.uH5584/_old	2009-03-11 17:00:32.000000000 +0100
+++ /var/tmp/diff_new_pack.uH5584/_new	2009-03-11 17:00:32.000000000 +0100
@@ -44,11 +44,19 @@
 # %files -f %{name}.lst
 #
 
-%gconf_schemas_prereq PreReq: /usr/bin/gconftool-2 coreutils
+%gconf_schemas_prereq PreReq: /usr/bin/gconftool-2 coreutils diffutils
 
 %end_gconf_schemas() \
-echo 'rmdir etc/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_posttrans\
-echo 'rmdir etc/gconf/schemas/outdated 2>/dev/null || true' >>$GCONF_SCHEMAS_NAME.schemas_preun\
+echo 'if test "x$UNINSTALL_SCHEMA_FILES" != "x"; then\
+    usr/bin/gconftool-2 --makefile-uninstall-rule $UNINSTALL_SCHEMA_FILES >/dev/null\
+    rm -f $UNINSTALL_SCHEMA_FILES\
+fi\
+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\
+fi' >>$GCONF_SCHEMAS_NAME.schemas_preun\
 %{nil}
 
 %def_gconf_schemas() \
@@ -58,10 +66,13 @@
 GCONF_SCHEMAS_NAME=%1\
 echo '%defattr (644, root, root, 755)' >%1.schemas_list\
 echo 'mkdir -p etc/gconf/schemas/outdated' >%1.schemas_pre\
-echo 'export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`' >%1.schemas_posttrans\
-echo 'if test -x usr/bin/gconftool-2 ; then\
-    export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`\
-fi' >%1.schemas_preun\
+echo 'export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`\
+INSTALL_SCHEMA_FILES=\
+UNINSTALL_SCHEMA_FILES=' >%1.schemas_posttrans\
+echo 'if test "$1" == "0"; then\
+    if test -x usr/bin/gconftool-2 ; then\
+        export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`\
+    fi' >%1.schemas_preun\
 %{nil}
 
 %_add_gconf_schemas() \
@@ -69,16 +80,25 @@
 echo "if test -f ${SCHEMAS#/} ; then\
     ln -f ${SCHEMAS#/} etc/gconf/schemas/outdated/\
 fi" >>$GCONF_SCHEMAS_NAME.schemas_pre\
-echo "rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\
-usr/bin/gconftool-2 --makefile-install-rule ${SCHEMAS#/} >/dev/null" >>$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\
-    elif test -f ${SCHEMAS#/} ; then\
-        usr/bin/gconftool-2 --makefile-uninstall-rule ${SCHEMAS#/} >/dev/null\
+echo "if test -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}; then\
+    cmp --quiet etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/} ${SCHEMAS#/}\
+    if test \\\$? != 0; then\
+        UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\\\"\
+        INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\
+    else\
+        rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}\
     fi\
-fi\
-rm -f etc/gconf/schemas/outdated/${SCHEMAS#/etc/gconf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\
+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\
+        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\
 %{nil}
 
 %add_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)