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: 02-Oct-2003 20:32:33
Branch: HEAD Handle: 2003100219323002
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
move to now fixed %{error} macro
Summary:
Revision Changes Path
1.171 +4 -4 openpkg-src/apache/apache.spec
1.6821 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.170 -r1.171 apache.spec
--- openpkg-src/apache/apache.spec 22 Sep 2003 11:45:29 -0000 1.170
+++ openpkg-src/apache/apache.spec 2 Oct 2003 18:32:32 -0000 1.171
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030922
+Release: 20031002
# package options (suexec related)
%option with_suexec yes
@@ -136,7 +136,7 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
-RPM ERROR: with_mod_php conflicts with with_mod_php3
+ %{error:build-time options 'with_mod_php' and 'with_mod_php3' conflict}
%endif
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_php_openssl
@@ -199,8 +199,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718
-PreReq: OpenPKG, openpkg >= 20030718
+BuildPreReq: OpenPKG, openpkg >= 20030927
+PreReq: OpenPKG, openpkg >= 20030927
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6820 -r1.6821 news.txt
--- openpkg-web/news.txt 2 Oct 2003 18:30:45 -0000 1.6820
+++ openpkg-web/news.txt 2 Oct 2003 18:32:30 -0000 1.6821
@@ -1,3 +1,4 @@
+02-Oct-2003: Upgraded package: P<apache-1.3.28-20031002>
02-Oct-2003: Upgraded package: P<gcc-3.3.1-20031002>
02-Oct-2003: Upgraded package: P<bogofilter-0.15.5.2-20031002>
02-Oct-2003: Upgraded package: P<sudo-1.6.7p5-20031002>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
