Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 gnome2-libs/gconf2/DETAILS                |    1 +
 gnome2-libs/gconf2/HISTORY                |    7 +++++++
 gnome2-libs/gconf2/PRE_BUILD              |    3 +++
 gnome2-libs/gconf2/gconf.xml.system.patch |   16 ++++++++++++++++
 4 files changed, 27 insertions(+)

New commits:
commit 3b83cfaa12da37c3e5f1772f7bdd05a9944c34ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gconf2: Fixes Bug #15306
    and upstream http://bugzilla.gnome.org/show_bug.cgi?id=572027
    PATCHLEVEL++ so system directory gets installed with proper
    permissions

diff --git a/gnome2-libs/gconf2/DETAILS b/gnome2-libs/gconf2/DETAILS
index 0b7d8dd..6ef7f3e 100755
--- a/gnome2-libs/gconf2/DETAILS
+++ b/gnome2-libs/gconf2/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/GConf-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/GConf/$BRANCH/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=LGPL
+      PATCHLEVEL=1
         WEB_SITE=http://www.gnome.org/projects/gconf/
          ENTERED=20020505
         KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index 076d669..c46f5eb 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,10 @@
+2009-08-02 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++ so system directory gets installed with proper
+         permissions
+       * PRE_BUILD: Apply gconf.xml.system.patch
+       * gconf.xml.system.patch: Fixes Bug #15306 and upstream
+         http://bugzilla.gnome.org/show_bug.cgi?id=572027
+
 2009-05-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.26.2
 
diff --git a/gnome2-libs/gconf2/PRE_BUILD b/gnome2-libs/gconf2/PRE_BUILD
new file mode 100755
index 0000000..09e909d
--- /dev/null
+++ b/gnome2-libs/gconf2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build                               &&
+patch $SOURCE_DIRECTORY/Makefile.in             \
+      $SCRIPT_DIRECTORY/gconf.xml.system.patch
diff --git a/gnome2-libs/gconf2/gconf.xml.system.patch 
b/gnome2-libs/gconf2/gconf.xml.system.patch
new file mode 100644
index 0000000..5557bab
--- /dev/null
+++ b/gnome2-libs/gconf2/gconf.xml.system.patch
@@ -0,0 +1,16 @@
+#
+# Adds gconf.xml.system to creation list, fixing SMGL Bug #155306 and 
upstream
+# bug http://bugzilla.gnome.org/show_bug.cgi?id=572027
+#
+diff -Naur GConf-2.26.2.orig/Makefile.in GConf-2.26.2/Makefile.in
+--- GConf-2.26.2.orig/Makefile.in      2009-05-14 08:20:45.000000000 -0700
++++ GConf-2.26.2/Makefile.in   2009-08-02 19:12:35.289525579 -0700
+@@ -765,6 +765,8 @@
+ 
+ 
+ install-data-local:
++      -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.system
++      -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.system
+       -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+       -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+       -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory