bless ncurses for CORE class and make screen and vim use it

ncurses/ncurses.spec

@@ -51,11 +51,11 @@ URL:          http://www.gnu.org/software/ncurses/
 Vendor:       Free Software Foundation
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
-Class:        BASE
+Class:        CORE
 Group:        Terminal
 License:      MIT-style
 Version:      %{V_base}.%{V_patchL}
-Release:      20070613
+Release:      20070616
 
 #   list of sources
 Source0:      ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
@@ -80,7 +80,7 @@ Patch100:     ncurses.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, sharutils
+BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
 AutoReq:      no
 AutoReqProv:  no

screen/screen.spec

@@ -33,7 +33,7 @@ Class:        CORE
 Group:        Terminal
 License:      GPL
 Version:      4.0.3
-Release:      20070423
+Release:      20070616
 
 #   list of sources
 Source0:      ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
@@ -42,8 +42,8 @@ Patch0:       screen.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, make
-PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  OpenPKG, openpkg >= 20040130, ncurses, make
+PreReq:       OpenPKG, openpkg >= 20040130, ncurses
 AutoReq:      no
 AutoReqProv:  no
 

vim/vim.spec

@@ -38,7 +38,7 @@ Class:        CORE
 Group:        Editor
 License:      Charityware
 Version:      %{V_vl}.%{V_pl}
-Release:      20070517
+Release:      20070616
 
 #   package options
 %option       with_x11        no
@@ -60,8 +60,8 @@ Patch2:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}/%{V_vl}.002
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20060823, ncurses
+PreReq:       OpenPKG, openpkg >= 20060823, ncurses
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11, gtk
 PreReq:       X11, gtk
@@ -119,14 +119,6 @@ AutoReqProv:  no
         i=`expr $i + 1`
     done
 
-    #   reorder the terminal library search to make sure our ncurses is
-    #   not picked up too easily (because we do not want an explicit
-    #   dependency to it because of vim:CORE vs. ncurses:BASE).
-    %{l_shtool} subst \
-        -e 's;ncurses termlib termcap curses;termlib termcap ncurses curses;' \
-        -e 's;\(.*TCL_DEFS=.*sed -e \)\(.\)\(.*\);\1\2/^[^-]/d\2 \2\3;' \
-        vim%{V_vs}/src/auto/configure
-
     #   adjust introduction text for OpenPKG branding
     %{l_shtool} subst \
         -e 's;Modified by;Packaged by;' \