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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   06-Feb-2004 16:47:11
  Branch: HEAD                             Handle: 2004020615470802

  Modified files:
    openpkg-src/apache2     apache2.spec
    openpkg-web             news.txt

  Log:
    remove extra warning as we were consecrated last week; poke in
    libiconv usage

  Summary:
    Revision    Changes     Path
    1.37        +7  -6      openpkg-src/apache2/apache2.spec
    1.8462      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 apache2.spec
  --- openpkg-src/apache2/apache2.spec  3 Feb 2004 19:59:34 -0000       1.36
  +++ openpkg-src/apache2/apache2.spec  6 Feb 2004 15:47:10 -0000       1.37
  @@ -34,7 +34,7 @@
   Group:        Web
   License:      ASF
   Version:      2.0.48
  -Release:      20040203
  +Release:      20040206
   
   #   list of sources
   Source0:      http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -61,11 +61,6 @@
       of users have contributed ideas, code, and documentation to the
       project.
   
  -    WARNING! This is version 2.0 of Apache, a completely overhauled version
  -    of the Apache HTTP server. Although it is mostly Apache 1.3 compatible,
  -    it is not a direct drop-in replacement. This software won't be released
  -    by OpenPKG (it is EVAL) until it is fit for use on production machines.
  -
   %track
       prog apache2 = {
           version   = 2.0.48
  @@ -76,6 +71,12 @@
   %prep
       %setup -q -n httpd-%{version}
       %patch -p0
  +    %{l_shtool} subst \
  +        -e 's;^\(PROGRAM_LDADD.*$\);\1 -liconv;' \
  +        Makefile.in support/Makefile.in
  +    %{l_shtool} subst \
  +        -e 's;^\(APRUTIL_LIBS.*$\);\1 -liconv;' \
  +        srclib/apr-util/Makefile
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.8461 -r1.8462 news.txt
  --- openpkg-web/news.txt      6 Feb 2004 14:09:55 -0000       1.8461
  +++ openpkg-web/news.txt      6 Feb 2004 15:47:08 -0000       1.8462
  @@ -1,3 +1,4 @@
  +06-Feb-2004: Upgraded package: P<apache2-2.0.48-20040206>
   06-Feb-2004: Upgraded package: P<libdnet-1.7-20040206>
   06-Feb-2004: Upgraded package: P<xinetd-2.3.13-20040206>
   06-Feb-2004: Upgraded package: P<ldapvi-1.1-20040206>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to