[Lunar-commits] <moonbase> dconf, GConf, gvfs: don't own giomodule.cache

[Paul Bredbury]

commit 7588b7e80cfc97c097b4566e0f2377af90d946e7
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sat Jan 15 01:02:28 2011 +0700

    dconf, GConf, gvfs: don't own giomodule.cache
    
    Prevent multiple ownership of /usr/lib/gio/modules/giomodule.cache
    As shown by:  lvu conflicts
---
 gnome2/desktop/gvfs/BUILD          |    8 ++++++--
 gnome2/desktop/gvfs/POST_INSTALL   |    4 ++++
 gnome2/platform/GConf/BUILD        |    8 ++++++++
 gnome2/platform/GConf/POST_INSTALL |    4 ++++
 zbeta/dconf/BUILD                  |    8 ++++++++
 zbeta/dconf/POST_INSTALL           |    4 ++++
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/gnome2/desktop/gvfs/BUILD b/gnome2/desktop/gvfs/BUILD
index f0ab69a..2208eb3 100644
--- a/gnome2/desktop/gvfs/BUILD
+++ b/gnome2/desktop/gvfs/BUILD
@@ -1,12 +1,16 @@
 (
 
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+  # Only want glib-2 to own /usr/lib/gio/modules/giomodule.cache
+  sedit "s:dummy gio-querymodules:dummy echo:" configure &&
+
+  ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD        \
                 --sysconfdir=/etc     \
                 --localstatedir=/var  \
                 --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
                 --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
                 $OPTS                                         &&
-    default_make
+
+  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/gnome2/desktop/gvfs/POST_INSTALL b/gnome2/desktop/gvfs/POST_INSTALL
new file mode 100644
index 0000000..469c38f
--- /dev/null
+++ b/gnome2/desktop/gvfs/POST_INSTALL
@@ -0,0 +1,4 @@
+if [[ -x /usr/bin/gio-querymodules ]] ; then
+	# Recreate /usr/lib/gio/modules/giomodule.cache
+	gio-querymodules /usr/lib/gio/modules
+fi
diff --git a/gnome2/platform/GConf/BUILD b/gnome2/platform/GConf/BUILD
new file mode 100644
index 0000000..30e502a
--- /dev/null
+++ b/gnome2/platform/GConf/BUILD
@@ -0,0 +1,8 @@
+(
+
+  # Only want glib-2 to own /usr/lib/gio/modules/giomodule.cache
+  sedit "s:dummy gio-querymodules:dummy echo:" configure &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/gnome2/platform/GConf/POST_INSTALL b/gnome2/platform/GConf/POST_INSTALL
new file mode 100644
index 0000000..469c38f
--- /dev/null
+++ b/gnome2/platform/GConf/POST_INSTALL
@@ -0,0 +1,4 @@
+if [[ -x /usr/bin/gio-querymodules ]] ; then
+	# Recreate /usr/lib/gio/modules/giomodule.cache
+	gio-querymodules /usr/lib/gio/modules
+fi
diff --git a/zbeta/dconf/BUILD b/zbeta/dconf/BUILD
new file mode 100644
index 0000000..30e502a
--- /dev/null
+++ b/zbeta/dconf/BUILD
@@ -0,0 +1,8 @@
+(
+
+  # Only want glib-2 to own /usr/lib/gio/modules/giomodule.cache
+  sedit "s:dummy gio-querymodules:dummy echo:" configure &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/dconf/POST_INSTALL b/zbeta/dconf/POST_INSTALL
new file mode 100644
index 0000000..469c38f
--- /dev/null
+++ b/zbeta/dconf/POST_INSTALL
@@ -0,0 +1,4 @@
+if [[ -x /usr/bin/gio-querymodules ]] ; then
+	# Recreate /usr/lib/gio/modules/giomodule.cache
+	gio-querymodules /usr/lib/gio/modules
+fi