[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/vim vim.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2002-05-31 10:24:16
[Download RAW message or body]

  OpenPKG CVS Repository
  http://www.openpkg.org/cvsweb/cvsweb.cgi
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   31-May-2002 12:24:16
  Branch: HEAD                             Handle: 2002053111241500

  Modified files:
    openpkg-src/vim         vim.spec

  Log:
    Err.... no, I talked about an _explicit_ "with_x11" option!
    The last approach meant the "vim" package results in different variations,
    dependent whether "gtk" and other packages are currently installed or
    not. This makes a nightmair on upgrades, because we cannot see ("rpm
    -qi vim | grep with_") how a package was built. So back this out
    and replace it with an explicit "with_x11" option featuring only X11/Gtk.

  Summary:
    Revision    Changes     Path
    1.63        +23 -3      openpkg-src/vim/vim.spec
  ____________________________________________________________________________

  Index: openpkg-src/vim/vim.spec
  ============================================================
  $ cvs diff -u -r1.62 -r1.63 vim.spec
  --- openpkg-src/vim/vim.spec	31 May 2002 08:38:34 -0000	1.62
  +++ openpkg-src/vim/vim.spec	31 May 2002 10:24:15 -0000	1.63
  @@ -23,10 +23,16 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package versions
   %define       V_vl  6.1
   %define       V_vs  61
   %define       V_pl  82
   
  +#   package options
  +%ifndef       with_x11
  +%define       with_x11  no
  +%endif
  +
   #   package information
   Name:         vim
   Summary:      The Vi (Improved) Text Editor
  @@ -133,6 +139,10 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20020206, gzip, patch
   PreReq:       OpenPKG, openpkg >= 20020206
  +%if "%{with_x11}" == "yes"
  +BuildPreReq:  X11, gtk
  +PreReq:       X11, gtk
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -164,9 +174,19 @@
             --prefix=%{l_prefix} \
             --enable-max-features \
             --with-tlib=termcap \
  -          --enable-gui=auto \
  -          --enable-gtk-check \
  -          --enable-gnome-check
  +%if "%{with_x11}" == "yes"
  +          --with-x \
  +          --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
  +          --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
  +          --enable-gui \
  +          --enable-gui=gtk \
  +          --with-gtk-prefix=%{l_prefix} \
  +          --disable-gtktest \
  +          --without-gnome
  +%else
  +          --without-x \
  +          --disable-gui
  +%endif
         %{l_make} %{l_mflags -O}
       )
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]