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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   06-Oct-2003 16:46:43
  Branch: HEAD                             Handle: 2003100615464102

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

  Log:
    Make an incomplete configuration at least not get wiped out on
    updates, as found by Matthias KURZ

  Summary:
    Revision    Changes     Path
    1.28        +4  -2      openpkg-src/apache2/apache2.spec
    1.6871      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 apache2.spec
  --- openpkg-src/apache2/apache2.spec  22 Jul 2003 08:10:38 -0000      1.27
  +++ openpkg-src/apache2/apache2.spec  6 Oct 2003 14:46:43 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      ASF
   Version:      2.0.47
  -Release:      20030722
  +Release:      20031006
   
   #   list of sources
   Source0:      http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  @@ -92,7 +92,9 @@
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars*
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +        %{l_files_std} \
  +        '%config %{l_prefix}/etc/apache2/*'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6870 -r1.6871 news.txt
  --- openpkg-web/news.txt      6 Oct 2003 14:07:37 -0000       1.6870
  +++ openpkg-web/news.txt      6 Oct 2003 14:46:41 -0000       1.6871
  @@ -1,3 +1,4 @@
  +06-Oct-2003: Upgraded package: P<apache2-2.0.47-20031006>
   06-Oct-2003: Upgraded package: P<amavisd-20030616p5-20031006>
   06-Oct-2003: New package: P<elm-2.4.107-20031006>
   06-Oct-2003: Upgraded package: P<openpkg-import-20031006-20031006>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to