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: 07-Feb-2003 17:20:34
Branch: HEAD Handle: 2003020716203201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
use new ORACLE/oracle package and add OCI7 support, too
Summary:
Revision Changes Path
1.112 +12 -1 openpkg-src/apache/apache.spec
1.3229 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.111 -r1.112 apache.spec
--- openpkg-src/apache/apache.spec 6 Feb 2003 11:26:56 -0000 1.111
+++ openpkg-src/apache/apache.spec 7 Feb 2003 16:20:33 -0000 1.112
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030206
+Release: 20030207
# package options (additionally used Apache modules; can be enabled without
thinking)
%option with_mod_ssl no
@@ -96,6 +96,7 @@
%option with_mod_php_pcre no
%option with_mod_php_ftp no
%option with_mod_php_java no
+%option with_mod_php_oci7 no
%option with_mod_php_oci8 no
%option with_mod_php_freetype no
%option with_mod_php_gettext no
@@ -233,6 +234,9 @@
%if "%{with_mod_php_mhash}" == "yes"
BuildPreReq: mhash
%endif
+%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+BuildPreReq: ORACLE
+%endif
%endif
%if "%{with_mod_php3}" == "yes"
BuildPreReq: make, bison, flex
@@ -411,6 +415,10 @@
%if "%{with_mod_php_imap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
+%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+ ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
+ export ORACLE_HOME
+%endif
./configure \
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
@@ -468,6 +476,9 @@
%endif
%if "%{with_mod_php_java}" == "yes"
--with-java=%{l_prefix}/libexec/j2se \
+%endif
+%if "%{with_mod_php_oci7}" == "yes"
+ --with-oracle \
%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3228 -r1.3229 news.txt
--- openpkg-web/news.txt 7 Feb 2003 16:13:45 -0000 1.3228
+++ openpkg-web/news.txt 7 Feb 2003 16:20:32 -0000 1.3229
@@ -1,3 +1,4 @@
+07-Feb-2003: Upgraded package: P<apache-1.3.27-20030207>
07-Feb-2003: Upgraded package: P<perl-dbi-20030207-20030207>
07-Feb-2003: Upgraded package: P<oracle-20030207-20030207>
07-Feb-2003: New package: P<oracle-20030207-20030207>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
