OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Feb-2004 21:54:19
Branch: HEAD Handle: 2004020520541602
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
resolve conflict with php package
Summary:
Revision Changes Path
1.206 +2 -1 openpkg-src/apache/apache.spec
1.8437 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.205 -r1.206 apache.spec
--- openpkg-src/apache/apache.spec 3 Feb 2004 19:59:34 -0000 1.205
+++ openpkg-src/apache/apache.spec 5 Feb 2004 20:54:18 -0000 1.206
@@ -62,7 +62,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040203
+Release: 20040205
# package options (suexec related)
%option with_suexec yes
@@ -1052,6 +1052,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/php-config
%endif
# optionally install suPHP wrapper binary
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8436 -r1.8437 news.txt
--- openpkg-web/news.txt 5 Feb 2004 20:26:40 -0000 1.8436
+++ openpkg-web/news.txt 5 Feb 2004 20:54:16 -0000 1.8437
@@ -1,3 +1,4 @@
+05-Feb-2004: Upgraded package: P<apache-1.3.29-20040205>
05-Feb-2004: Upgraded package: P<lynx-2.8.5-20040205>
05-Feb-2004: Upgraded package: P<imagemagick-5.5.7.16-20040205>
05-Feb-2004: Upgraded package: P<gcc34-3.4s20040204-20040205>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
