fixed the recursive .conf inclusion - and the useage of var_append to add

hooks (this _must_ be hook_add ... !)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1673 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/gnome24/gconf/gconf-pkg.conf

@@ -0,0 +1,32 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/gnome24/gconf/gconf.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ $pkg != "gconf" ] ; then
+	# exclude some gconf files - so we do not need to patch every
+	# single package ...
+	flistdel="$flistdel|$sysconfdir/gconf/%gconf.xml"
+fi
+
+# exclude some gconf files - so we do not need to patch every
+# single package ...
+flistdel="$flistdel|$sysconfdir/gconf/gconf.xml.*"
+

package/gnome24/gconf/gconf.conf

@@ -20,22 +20,12 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if [ $pkg = "scrollkeeper" ] ; then
-	. $base/package/*/*/gnome-24.conf
+. $base/package/*/*/gnome-24.conf
 
-	gconf_pm() {
-		echo "Installing cron script ..."
-		rock_substitute $confdir/gconf.cron > $root/etc/cron.d/80-gconf
-		chmod +x $root/etc/cron.d/80-gconf
-	}
-	var_append postinstall ' ' 'gconf_pm'
-else
-	# exclude some gconf files - so we do not need to patch every
-	# single package ...
-	flistdel="$flistdel|$sysconfdir/gconf/%gconf.xml"
-fi
-
-# exclude some gconf files - so we do not need to patch every
-# single package ...
-flistdel="$flistdel|$sysconfdir/gconf/gconf.xml.*"
+gconf_pm() {
+	echo "Installing cron script ..."
+	rock_substitute $confdir/gconf.cron > $root/etc/cron.d/80-gconf
+	chmod +x $root/etc/cron.d/80-gconf
+}
+hook_add postinstall 3 'gconf_pm'
 

package/gnome24/glib/gnome-24.conf

@@ -52,9 +52,9 @@ configure_features() {
 
 [ -z "$SHOW_CONFIG_HELP" ] && hook_add preconf 3 "configure_features"
 
-. package/*/scrollkeeper/scrollkeeper.conf
-. package/*/gconf/gconf.conf
-. package/*/gtk+/gtk+.conf
+. package/*/scrollkeeper/scrollkeeper-pkg.conf
+. package/*/gconf/gconf-pkg.conf
+. package/*/gtk+/gtk+-pkg.conf
 
 #@FIXME temporary solution until xrender stuff is sorted out:
 #       pkgconfig path in gnome24 must be first

package/gnome24/gtk+/gtk+-pkg.conf

@@ -0,0 +1,27 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/gnome24/gtk+/gtk+.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ $pkg != "gtk+" ] ; then
+	# exclude some gconf files - so we do not need to patch every
+	# single package ...
+	flistdel="$flistdel|etc/$prefix/gtk-2.0/gdk-pixbuf.loaders"
+fi

package/gnome24/gtk+/gtk+.conf

@@ -20,23 +20,18 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if [ $pkg = "gtk+" ] ; then
-	. $base/package/*/*/gnome-24.conf
+. $base/package/*/*/gnome-24.conf
 
-	# --enable-debug=no/minimum/yes turn on debugging [default=minimum]
-	# --enable-fbmanager  enable framebuffer manager support (GtkFB)
-	var_append confopt ' ' "--with-xinput=yes"
+# --enable-debug=no/minimum/yes turn on debugging [default=minimum]
+# --enable-fbmanager  enable framebuffer manager support (GtkFB)
+var_append confopt ' ' "--with-xinput=yes"
 
-	gdkpixbuf_pm() {
-		echo "Installing cron script ..."
-		rock_substitute $confdir/gdkpixbuf.cron \
-			> $root/etc/cron.d/82-gdkpixbuf
-		chmod +x $root/etc/cron.d/82-gdkpixbuf
-	}
+gdkpixbuf_pm() {
+	echo "Installing cron script ..."
+	rock_substitute $confdir/gdkpixbuf.cron \
+		> $root/etc/cron.d/82-gdkpixbuf
+	chmod +x $root/etc/cron.d/82-gdkpixbuf
+}
+
+hook_add postinstall 3 'gdkpixbuf_pm'
 
-	var_append postinstall ' ' 'gdkpixbuf_pm'
-else
-	# exclude some gconf files - so we do not need to patch every
-	# single package ...
-	flistdel="$flistdel|etc/$prefix/gtk-2.0/gdk-pixbuf.loaders"
-fi

package/gnome24/scrollkeeper/scrollkeeper-pkg.conf

@@ -0,0 +1,32 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/gnome24/scrollkeeper/scrollkeeper.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ $pkg != "scrollkeeper" ] ; then
+	# exclude some scrollkeeper files - so we do not need to patch every
+	# single package ...
+	flistdel="$flistdel|etc/xml/catalog"
+	flistdel="$flistdel|var/.*scrollkeeper_.*cl.xml"
+	flistdel="$flistdel|var/.*scrollkeeper/scrollkeeper_docs"
+	flistdel="$flistdel|var/.*scrollkeeper/TOC/.*"
+	flistdel="$flistdel|var/.*scrollkeeper/index/.*"
+fi
+

package/gnome24/scrollkeeper/scrollkeeper.conf

@@ -20,26 +20,16 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if [ $pkg = "scrollkeeper" ] ; then
-	. $base/package/*/*/gnome-24.conf
+. $base/package/*/*/gnome-24.conf
 
-	confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde31/omf"
+confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde31/omf"
 
-	scrollkeeper_pm() {
-		echo "Installing cron script ..."
-		rock_substitute $confdir/scrollkeeper.cron \
-			> $root/etc/cron.d/81-scrollkeeper
-		chmod +x $root/etc/cron.d/81-scrollkeeper
-	}
+scrollkeeper_pm() {
+	echo "Installing cron script ..."
+	rock_substitute $confdir/scrollkeeper.cron \
+		> $root/etc/cron.d/81-scrollkeeper
+	chmod +x $root/etc/cron.d/81-scrollkeeper
+}
 
-	var_append postinstall ' ' 'scrollkeeper_pm'
-else
-	# exclude some scrollkeeper files - so we do not need to patch every
-	# single package ...
-	flistdel="$flistdel|etc/xml/catalog"
-	flistdel="$flistdel|var/.*scrollkeeper_.*cl.xml"
-	flistdel="$flistdel|var/.*scrollkeeper/scrollkeeper_docs"
-	flistdel="$flistdel|var/.*scrollkeeper/TOC/.*"
-	flistdel="$flistdel|var/.*scrollkeeper/index/.*"
-fi
+hook_add postinstall 5 "scrollkeeper_pm"