OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   16-Jun-2007 22:05:33
  Branch: HEAD                             Handle: 2007061621053101

  Modified files:
    openpkg-src/ncurses     ncurses.spec
    openpkg-src/screen      screen.spec
    openpkg-src/vim         vim.spec

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

  Summary:
    Revision    Changes     Path
    1.327       +3  -3      openpkg-src/ncurses/ncurses.spec
    1.54        +3  -3      openpkg-src/screen/screen.spec
    1.498       +3  -11     openpkg-src/vim/vim.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ncurses/ncurses.spec
  ============================================================================
  $ cvs diff -u -r1.326 -r1.327 ncurses.spec
  --- openpkg-src/ncurses/ncurses.spec  13 Jun 2007 06:19:56 -0000      1.326
  +++ openpkg-src/ncurses/ncurses.spec  16 Jun 2007 20:05:31 -0000      1.327
  @@ -51,11 +51,11 @@
   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 @@
   #   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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/screen/screen.spec
  ============================================================================
  $ cvs diff -u -r1.53 -r1.54 screen.spec
  --- openpkg-src/screen/screen.spec    23 Apr 2007 09:40:32 -0000      1.53
  +++ openpkg-src/screen/screen.spec    16 Jun 2007 20:05:32 -0000      1.54
  @@ -33,7 +33,7 @@
   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 @@
   #   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
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vim/vim.spec
  ============================================================================
  $ cvs diff -u -r1.497 -r1.498 vim.spec
  --- openpkg-src/vim/vim.spec  17 May 2007 16:34:16 -0000      1.497
  +++ openpkg-src/vim/vim.spec  16 Jun 2007 20:05:32 -0000      1.498
  @@ -38,7 +38,7 @@
   Group:        Editor
   License:      Charityware
   Version:      %{V_vl}.%{V_pl}
  -Release:      20070517
  +Release:      20070616
   
   #   package options
   %option       with_x11        no
  @@ -60,8 +60,8 @@
   #   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 @@
           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;' \
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to