diff --git a/package/gnome24/gconf/gconf.conf b/package/gnome24/gconf/gconf.conf index 45d244334..89dc04f7e 100644 --- a/package/gnome24/gconf/gconf.conf +++ b/package/gnome24/gconf/gconf.conf @@ -20,13 +20,22 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -IN_GCONF=yes . $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 -} +if [ $pkg = "scrollkeeper" ] ; then + 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.*" -var_append postinstall ' ' 'gconf_pm' diff --git a/package/gnome24/gconf/gnome-24.gconf.conf b/package/gnome24/gconf/gnome-24.gconf.conf deleted file mode 100644 index d7f5e2f3f..000000000 --- a/package/gnome24/gconf/gnome-24.gconf.conf +++ /dev/null @@ -1,26 +0,0 @@ -# --- 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/gnome-24-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 --- - -# exclude some gconf files - so we do not need to patch every -# single package ... -[ -z "$IN_GCONF" ] && flistdel="$flistdel|etc/$prefix/gconf/%gconf.xml" -flistdel="$flistdel|etc/$prefix/gconf/gconf.xml.*" diff --git a/package/gnome24/glib/gnome-24.conf b/package/gnome24/glib/gnome-24.conf index 47e8f900e..c6cf621a4 100644 --- a/package/gnome24/glib/gnome-24.conf +++ b/package/gnome24/glib/gnome-24.conf @@ -52,7 +52,7 @@ configure_features() { [ -z "$SHOW_CONFIG_HELP" ] && hook_add preconf 3 "configure_features" -[ -z "$IN_GCONF" ] && . package/*/gconf/gnome-24.gconf.conf +. package/*/gconf/gconf.conf . package/*/gtk+/gnome-24.gtk+.conf . package/*/scrollkeeper/scrollkeeper.conf