diff --git a/package/gnome24/glib/gnome-24.conf b/package/gnome24/glib/gnome-24.conf index 95f4c0d6d..47e8f900e 100644 --- a/package/gnome24/glib/gnome-24.conf +++ b/package/gnome24/glib/gnome-24.conf @@ -44,17 +44,19 @@ export PYTHONPATH="$root/$prefix/lib/python2.3/site-packages/:/usr/lib/python2.3 #@FIXME remove once gnome24 is polished: configure_features() { - if [ -f ./configure ]; then + if [ -f ./configure ] ; then echo Logging ./configure features: eval_config_command --help fi } + [ -z "$SHOW_CONFIG_HELP" ] && hook_add preconf 3 "configure_features" [ -z "$IN_GCONF" ] && . package/*/gconf/gnome-24.gconf.conf . package/*/gtk+/gnome-24.gtk+.conf -. package/*/scrollkeeper/gnome-24.scrollkeeper.conf +. package/*/scrollkeeper/scrollkeeper.conf #@FIXME temporary solution until xrender stuff is sorted out: # pkgconfig path in gnome24 must be first export PKG_CONFIG_PATH="/opt/gnome24/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/X11/lib/pkgconfig/" + diff --git a/package/gnome24/scrollkeeper/gnome-24.scrollkeeper.conf b/package/gnome24/scrollkeeper/gnome-24.scrollkeeper.conf deleted file mode 100644 index be4d92ed3..000000000 --- a/package/gnome24/scrollkeeper/gnome-24.scrollkeeper.conf +++ /dev/null @@ -1,29 +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/scrollkeeper/gnome-24-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 --- - -# 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/.*" diff --git a/package/gnome24/scrollkeeper/scrollkeeper.conf b/package/gnome24/scrollkeeper/scrollkeeper.conf index 0578d646f..d38b40242 100644 --- a/package/gnome24/scrollkeeper/scrollkeeper.conf +++ b/package/gnome24/scrollkeeper/scrollkeeper.conf @@ -20,15 +20,24 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-24.conf +if [ $pkg = "scrollkeeper" ] ; then + 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 -var_append postinstall ' ' 'scrollkeeper_pm'