From 6dce558cbde8a34420346f16f4330f25ec12b848 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Tue, 4 Jul 2006 19:21:07 +0000 Subject: [PATCH] Stefan Fiedler: automake: flag only automake19 as CORE bdb: flag only bdb42 as CORE, remove (unneeded?) version parameter to pkgfork calls proposal, NOTE: it's untested for now [2006061902280425150] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7695 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/automake/preconfig.in | 4 ++-- package/base/bdb/preconfig.in | 8 ++++---- package/base/bdb/subconfig-libs.in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/base/automake/preconfig.in b/package/base/automake/preconfig.in index 2258e6299..b6391a82b 100644 --- a/package/base/automake/preconfig.in +++ b/package/base/automake/preconfig.in @@ -22,8 +22,8 @@ if pkgcheck automake X then - pkgfork automake automake17 - pkgfork automake automake18 + pkgfork automake automake17 unflag CORE + pkgfork automake automake18 unflag CORE pkgfork automake automake19 pkgremove automake fi diff --git a/package/base/bdb/preconfig.in b/package/base/bdb/preconfig.in index 1cb259fa3..7958393f4 100644 --- a/package/base/bdb/preconfig.in +++ b/package/base/bdb/preconfig.in @@ -22,10 +22,10 @@ if pkgcheck bdb X then - pkgfork bdb bdb33 version 3.3.11 - pkgfork bdb bdb40 version 4.0.14 - pkgfork bdb bdb41 version 4.1.25 - pkgfork bdb bdb42 version 4.2.52 + pkgfork bdb bdb33 unflag CORE + pkgfork bdb bdb40 unflag CORE + pkgfork bdb bdb41 unflag CORE + pkgfork bdb bdb42 pkgremove bdb fi diff --git a/package/base/bdb/subconfig-libs.in b/package/base/bdb/subconfig-libs.in index 0d7c024d4..16ec553e5 100644 --- a/package/base/bdb/subconfig-libs.in +++ b/package/base/bdb/subconfig-libs.in @@ -25,7 +25,7 @@ then menu_begin MENU_PKG_BDB 'BerkleyDB Options' block_begin 4 - # we choose to select the newest bdb availible as default + # we choose to select the newest bdb available as default if pkgcheck bdb=bdb33 X ; then bdbdefselect="$bdbdefselect bdb33 'Using v3.3 as default'" bdbdefault="bdb33";