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:   22-Dec-2006 16:56:25
  Branch: OPENPKG_2_STABLE                 Handle: 2006122215562500

  Modified files:           (Branch: OPENPKG_2_STABLE)
    openpkg-src/db          db.spec
    openpkg-src/pcre        pcre.spec

  Log:
    MFC: make up leeway for 2_STABLE by virtue of build-time results

  Summary:
    Revision    Changes     Path
    1.66.2.4    +4  -1      openpkg-src/db/db.spec
    1.49.2.3    +4  -2      openpkg-src/pcre/pcre.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/db/db.spec
  ============================================================================
  $ cvs diff -u -r1.66.2.3 -r1.66.2.4 db.spec
  --- openpkg-src/db/db.spec    16 Oct 2006 14:49:22 -0000      1.66.2.3
  +++ openpkg-src/db/db.spec    22 Dec 2006 15:56:25 -0000      1.66.2.4
  @@ -37,7 +37,7 @@
   Group:        Database
   License:      BSD
   Version:      %{V_version}.%{V_revision}
  -Release:      2.20061018
  +Release:      2.20061222
   
   #   package options
   %option       with_compat no
  @@ -53,6 +53,9 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 2.20061018, gcc
   PreReq:       OpenPKG, openpkg >= 2.20061018
  +%if "%{with_cxx}" == "yes"
  +BuildPreReq:  gcc::with_cxx = yes
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pcre/pcre.spec
  ============================================================================
  $ cvs diff -u -r1.49.2.2 -r1.49.2.3 pcre.spec
  --- openpkg-src/pcre/pcre.spec        16 Oct 2006 14:53:59 -0000      1.49.2.2
  +++ openpkg-src/pcre/pcre.spec        22 Dec 2006 15:56:25 -0000      1.49.2.3
  @@ -32,8 +32,8 @@
   Class:        BASE
   Group:        Libraries
   License:      LGPL
  -Version:      6.7
  -Release:      2.20061018
  +Version:      7.0
  +Release:      2.20061222
   
   #   package options
   %option       with_utf8  no
  @@ -68,8 +68,10 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  +    GREP="grep" \
       ./configure \
           --prefix=%{l_prefix} \
  +        --mandir=%{l_prefix}/man \
   %if "%{with_utf8}" == "yes"
           --enable-utf8 \
   %endif
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to