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: 09-Oct-2003 10:31:24
Branch: HEAD Handle: 2003100909312201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix XML (Expat based) support. Now you especially you can build with
both mod_dav and mod_php (with XML support enabled)
Summary:
Revision Changes Path
1.175 +8 -4 openpkg-src/apache/apache.spec
1.6928 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.174 -r1.175 apache.spec
--- openpkg-src/apache/apache.spec 8 Oct 2003 07:17:00 -0000 1.174
+++ openpkg-src/apache/apache.spec 9 Oct 2003 08:31:23 -0000 1.175
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20031008
+Release: 20031009
# package options (suexec related)
%option with_suexec yes
@@ -282,7 +282,7 @@
BuildPreReq: imap, openssl
PreReq: imap, openssl
%endif
-%if "%{with_mod_php_xml}" == "yes"
+%if "%{with_mod_dav}" == "yes" || "%{with_mod_php_xml}" == "yes"
BuildPreReq: expat
PreReq: expat
%endif
@@ -610,7 +610,10 @@
--with-imap-ssl=%{l_prefix} \
%endif
%if "%{with_mod_php_xml}" == "yes"
- --with-xml=%{l_prefix} \
+ --enable-xml \
+ --with-expat-dir=%{l_prefix} \
+%else
+ --disable-xml \
%endif
%if "%{with_mod_php_dom}" == "yes"
--with-dom=%{l_prefix} \
@@ -721,7 +724,8 @@
%endif
LDFLAGS="%{l_cflags -O}" \
./configure \
- --with-apache=../apache_%{V_apache}
+ --with-apache=../apache_%{V_apache} \
+ --with-expat=%{l_prefix}
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install
) || exit $?
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6927 -r1.6928 news.txt
--- openpkg-web/news.txt 9 Oct 2003 08:28:56 -0000 1.6927
+++ openpkg-web/news.txt 9 Oct 2003 08:31:22 -0000 1.6928
@@ -1,3 +1,4 @@
+09-Oct-2003: Upgraded package: P<apache-1.3.28-20031009>
09-Oct-2003: Upgraded package: P<php-4.3.3-20031009>
09-Oct-2003: Upgraded package: P<openssh-3.7.1p2-20031009>
08-Oct-2003: Upgraded package: P<quagga-0.96.3-20031008>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
