From cff72df55d3a9a31458c1db3a8573f1c1e5f1919 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Mon, 13 Jun 2005 12:32:51 +0000 Subject: [PATCH] Andreas V. Meier: move gnome-14.conf to package/gnome14 fix source of gnome-14.conf where neccessary [2005052419363424526] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6088 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome14/bonobo-conf10/bonobo-conf10.conf | 2 +- package/gnome14/bonobo10/bonobo10.conf | 2 +- package/gnome14/ee03/ee03.conf | 2 +- package/gnome14/gal01/gal01.conf | 2 +- package/gnome14/gconf110/gconf110.conf | 2 +- package/gnome14/gdk-pixbuf10/gdk-pixbuf10.conf | 2 +- package/gnome14/ghex12/ghex12.conf | 2 +- package/gnome14/gimp-print42/gimp-print42.conf | 2 +- package/gnome14/glade10/glade10.conf | 2 +- package/gnome14/glib12/glib12.conf | 2 +- package/gnome14/{glib12 => }/gnome-14.conf | 0 package/gnome14/gnome-audio14/gnome-audio14.conf | 2 +- package/gnome14/gnome-libs14/gnome-libs14.conf | 2 +- package/gnome14/gnome-print10/gnome-print10.conf | 2 +- package/gnome14/gnome14-dirtree/gnome14-dirtree.conf | 2 +- package/gnome14/gnomemm12/gnomemm12.conf | 2 +- package/gnome14/gtk+12/gtk+12.conf | 2 +- package/gnome14/gtk+extra10/gtk+extra10.conf | 2 +- package/gnome14/gtk-engines10/gtk-engines10.conf | 2 +- package/gnome14/gtkhtml1/gtkhtml1.conf | 2 +- package/gnome14/gtkmm12/gtkmm12.conf | 2 +- package/gnome14/guppi/guppi.conf | 2 +- package/gnome14/libghttp10/libghttp10.conf | 2 +- package/gnome14/libglade10/libglade10.conf | 2 +- package/gnome14/oaf10/oaf10.conf | 2 +- package/gnome14/orbit10/orbit10.conf | 2 +- package/gnome14/rep-gtk01/rep-gtk01.conf | 2 +- package/gnome14/soup/soup.conf | 2 +- package/jimmy/beaver/beaver.conf | 2 +- package/jimmy/gentoo/gentoo.conf | 2 +- package/nikolaus/mgt/mgt.conf | 2 +- package/public/cinepaint/cinepaint.conf | 2 +- package/public/gcombust/gcombust.conf | 2 +- package/public/gpa/gpa.conf | 2 +- package/public/sylpheed/sylpheed.conf | 2 +- package/stefanp/gnucash/gnucash.conf | 2 +- package/x11/imlib/imlib.conf | 2 +- 37 files changed, 36 insertions(+), 36 deletions(-) rename package/gnome14/{glib12 => }/gnome-14.conf (100%) diff --git a/package/gnome14/bonobo-conf10/bonobo-conf10.conf b/package/gnome14/bonobo-conf10/bonobo-conf10.conf index 118d1d9e1..852b26933 100644 --- a/package/gnome14/bonobo-conf10/bonobo-conf10.conf +++ b/package/gnome14/bonobo-conf10/bonobo-conf10.conf @@ -21,6 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/bonobo10/bonobo10.conf b/package/gnome14/bonobo10/bonobo10.conf index 37b1cf2a4..46bb6be59 100644 --- a/package/gnome14/bonobo10/bonobo10.conf +++ b/package/gnome14/bonobo10/bonobo10.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/ee03/ee03.conf b/package/gnome14/ee03/ee03.conf index b986af3d5..0c1134efc 100644 --- a/package/gnome14/ee03/ee03.conf +++ b/package/gnome14/ee03/ee03.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gal01/gal01.conf b/package/gnome14/gal01/gal01.conf index 4188e8bc5..a8ea48193 100644 --- a/package/gnome14/gal01/gal01.conf +++ b/package/gnome14/gal01/gal01.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gconf110/gconf110.conf b/package/gnome14/gconf110/gconf110.conf index 009a85759..69a7e065c 100644 --- a/package/gnome14/gconf110/gconf110.conf +++ b/package/gnome14/gconf110/gconf110.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gdk-pixbuf10/gdk-pixbuf10.conf b/package/gnome14/gdk-pixbuf10/gdk-pixbuf10.conf index cd0724031..84a6a2c8c 100644 --- a/package/gnome14/gdk-pixbuf10/gdk-pixbuf10.conf +++ b/package/gnome14/gdk-pixbuf10/gdk-pixbuf10.conf @@ -21,4 +21,4 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/ghex12/ghex12.conf b/package/gnome14/ghex12/ghex12.conf index 4f32ffdcf..00558f96f 100644 --- a/package/gnome14/ghex12/ghex12.conf +++ b/package/gnome14/ghex12/ghex12.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gimp-print42/gimp-print42.conf b/package/gnome14/gimp-print42/gimp-print42.conf index ad0a2f436..c08d34e88 100644 --- a/package/gnome14/gimp-print42/gimp-print42.conf +++ b/package/gnome14/gimp-print42/gimp-print42.conf @@ -21,6 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/glade10/glade10.conf b/package/gnome14/glade10/glade10.conf index 379ffba0b..c6b5edeb4 100644 --- a/package/gnome14/glade10/glade10.conf +++ b/package/gnome14/glade10/glade10.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/glib12/glib12.conf b/package/gnome14/glib12/glib12.conf index a1673433d..ff3b6045b 100644 --- a/package/gnome14/glib12/glib12.conf +++ b/package/gnome14/glib12/glib12.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- NO_SANITY_CHECK=1 -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf [ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." diff --git a/package/gnome14/glib12/gnome-14.conf b/package/gnome14/gnome-14.conf similarity index 100% rename from package/gnome14/glib12/gnome-14.conf rename to package/gnome14/gnome-14.conf diff --git a/package/gnome14/gnome-audio14/gnome-audio14.conf b/package/gnome14/gnome-audio14/gnome-audio14.conf index dbaec985c..4e85c658b 100644 --- a/package/gnome14/gnome-audio14/gnome-audio14.conf +++ b/package/gnome14/gnome-audio14/gnome-audio14.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gnome-libs14/gnome-libs14.conf b/package/gnome14/gnome-libs14/gnome-libs14.conf index ef0970520..25f74a9df 100644 --- a/package/gnome14/gnome-libs14/gnome-libs14.conf +++ b/package/gnome14/gnome-libs14/gnome-libs14.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf gl_main() { ln -fs /bin/true gtkdoc-fixxref diff --git a/package/gnome14/gnome-print10/gnome-print10.conf b/package/gnome14/gnome-print10/gnome-print10.conf index afdc65104..0d676e1e2 100644 --- a/package/gnome14/gnome-print10/gnome-print10.conf +++ b/package/gnome14/gnome-print10/gnome-print10.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf inmake="mkdir -p /usr/share/fonts ; touch /usr/share/fonts/fontmap" postmake="rm -rf /usr/include/libgnomeprint ; ln -s gnome-1.0/libgnomeprint /usr/include/libgnomeprint" diff --git a/package/gnome14/gnome14-dirtree/gnome14-dirtree.conf b/package/gnome14/gnome14-dirtree/gnome14-dirtree.conf index 572494871..72261cdc3 100644 --- a/package/gnome14/gnome14-dirtree/gnome14-dirtree.conf +++ b/package/gnome14/gnome14-dirtree/gnome14-dirtree.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- NO_SANITY_CHECK=1 -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf gnome14_dirtree() { diff --git a/package/gnome14/gnomemm12/gnomemm12.conf b/package/gnome14/gnomemm12/gnomemm12.conf index 9801658f9..2aef3a7c6 100644 --- a/package/gnome14/gnomemm12/gnomemm12.conf +++ b/package/gnome14/gnomemm12/gnomemm12.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gtk+12/gtk+12.conf b/package/gnome14/gtk+12/gtk+12.conf index 4c47d3dbf..a08a5d608 100644 --- a/package/gnome14/gtk+12/gtk+12.conf +++ b/package/gnome14/gtk+12/gtk+12.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf [ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." diff --git a/package/gnome14/gtk+extra10/gtk+extra10.conf b/package/gnome14/gtk+extra10/gtk+extra10.conf index bd5418a5d..f1cc4a4c8 100644 --- a/package/gnome14/gtk+extra10/gtk+extra10.conf +++ b/package/gnome14/gtk+extra10/gtk+extra10.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gtk-engines10/gtk-engines10.conf b/package/gnome14/gtk-engines10/gtk-engines10.conf index db5505f72..9dcb68fec 100644 --- a/package/gnome14/gtk-engines10/gtk-engines10.conf +++ b/package/gnome14/gtk-engines10/gtk-engines10.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/gtkhtml1/gtkhtml1.conf b/package/gnome14/gtkhtml1/gtkhtml1.conf index baaa0414f..73164ff6e 100644 --- a/package/gnome14/gtkhtml1/gtkhtml1.conf +++ b/package/gnome14/gtkhtml1/gtkhtml1.conf @@ -21,6 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf postinstall="ln -s libgtkhtml-1.1.so /$prefix/lib/libgtkhtml.so" diff --git a/package/gnome14/gtkmm12/gtkmm12.conf b/package/gnome14/gtkmm12/gtkmm12.conf index a4c389777..d7d493913 100644 --- a/package/gnome14/gtkmm12/gtkmm12.conf +++ b/package/gnome14/gtkmm12/gtkmm12.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/guppi/guppi.conf b/package/gnome14/guppi/guppi.conf index 0a8012b41..2378eb3a3 100644 --- a/package/gnome14/guppi/guppi.conf +++ b/package/gnome14/guppi/guppi.conf @@ -21,4 +21,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/libghttp10/libghttp10.conf b/package/gnome14/libghttp10/libghttp10.conf index dcbac3ca4..2e017db44 100644 --- a/package/gnome14/libghttp10/libghttp10.conf +++ b/package/gnome14/libghttp10/libghttp10.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/libglade10/libglade10.conf b/package/gnome14/libglade10/libglade10.conf index f689927b7..d66ce5ea9 100644 --- a/package/gnome14/libglade10/libglade10.conf +++ b/package/gnome14/libglade10/libglade10.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/oaf10/oaf10.conf b/package/gnome14/oaf10/oaf10.conf index 7c3774997..231a85feb 100644 --- a/package/gnome14/oaf10/oaf10.conf +++ b/package/gnome14/oaf10/oaf10.conf @@ -21,6 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf confopt="$confopt --enable-more-warnings=no" diff --git a/package/gnome14/orbit10/orbit10.conf b/package/gnome14/orbit10/orbit10.conf index 4c1b9861e..24e24f193 100644 --- a/package/gnome14/orbit10/orbit10.conf +++ b/package/gnome14/orbit10/orbit10.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf postmake="cp -r docs/* $docdir" diff --git a/package/gnome14/rep-gtk01/rep-gtk01.conf b/package/gnome14/rep-gtk01/rep-gtk01.conf index d4cd905fa..f05ef9ce1 100644 --- a/package/gnome14/rep-gtk01/rep-gtk01.conf +++ b/package/gnome14/rep-gtk01/rep-gtk01.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/gnome14/soup/soup.conf b/package/gnome14/soup/soup.conf index 99ae48822..0c19195e9 100644 --- a/package/gnome14/soup/soup.conf +++ b/package/gnome14/soup/soup.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/jimmy/beaver/beaver.conf b/package/jimmy/beaver/beaver.conf index 64ef867ce..b64f7f6c3 100644 --- a/package/jimmy/beaver/beaver.conf +++ b/package/jimmy/beaver/beaver.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf srcdir="beaver-$ver/src" makeopt="DESTDIR=$root/$prefix $makeopt" makeinstopt="DESTDIR=$root/$prefix $makeinstopt" diff --git a/package/jimmy/gentoo/gentoo.conf b/package/jimmy/gentoo/gentoo.conf index d5647adb0..ee2cafa43 100644 --- a/package/jimmy/gentoo/gentoo.conf +++ b/package/jimmy/gentoo/gentoo.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/nikolaus/mgt/mgt.conf b/package/nikolaus/mgt/mgt.conf index 7430add89..b87080a1d 100644 --- a/package/nikolaus/mgt/mgt.conf +++ b/package/nikolaus/mgt/mgt.conf @@ -21,4 +21,4 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/public/cinepaint/cinepaint.conf b/package/public/cinepaint/cinepaint.conf index 2b5ee8799..8e3304eb0 100644 --- a/package/public/cinepaint/cinepaint.conf +++ b/package/public/cinepaint/cinepaint.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/public/gcombust/gcombust.conf b/package/public/gcombust/gcombust.conf index 3bd70f575..3ab1f8103 100644 --- a/package/public/gcombust/gcombust.conf +++ b/package/public/gcombust/gcombust.conf @@ -21,5 +21,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/public/gpa/gpa.conf b/package/public/gpa/gpa.conf index d8fbdfa2b..1f70e4f90 100644 --- a/package/public/gpa/gpa.conf +++ b/package/public/gpa/gpa.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf diff --git a/package/public/sylpheed/sylpheed.conf b/package/public/sylpheed/sylpheed.conf index c2786ce90..1b5d59892 100644 --- a/package/public/sylpheed/sylpheed.conf +++ b/package/public/sylpheed/sylpheed.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf confopt="$confopt --enable-threads --enable-ssl" diff --git a/package/stefanp/gnucash/gnucash.conf b/package/stefanp/gnucash/gnucash.conf index 1f7c5fb90..41503f0ad 100644 --- a/package/stefanp/gnucash/gnucash.conf +++ b/package/stefanp/gnucash/gnucash.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf var_append confopt ' ' '--disable-prefer-db1' [ -f $root/var/adm/packages/openhbci ] && var_append confopt ' ' '--enable-hbci' diff --git a/package/x11/imlib/imlib.conf b/package/x11/imlib/imlib.conf index d118c8b40..e36a6a72d 100644 --- a/package/x11/imlib/imlib.conf +++ b/package/x11/imlib/imlib.conf @@ -21,5 +21,5 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-14.conf +. $base/package/gnome14/gnome-14.conf