OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Feb-2007 10:52:18
Branch: HEAD Handle: 2007020509521700
Modified files:
openpkg-src/apache apache.spec
Log:
rename option 'with_mod_php_xslt' to 'with_mod_php_xsl', since it
specifies a group of functions listed as 'XSL functions' in the PHP
documentation (http://www.php.net/manual/en/ref.xsl.php). Furthermore
it has nothing to do with another group called 'XSLT functions'
(http://www.php.net/manual/en/ref.xslt.php). Thus this option was
mistakable in the past.
Summary:
Revision Changes Path
1.373 +12 -6 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.372 -r1.373 apache.spec
--- openpkg-src/apache/apache.spec 30 Jan 2007 14:10:33 -0000 1.372
+++ openpkg-src/apache/apache.spec 5 Feb 2007 09:52:17 -0000 1.373
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070130
+Release: 20070205
# package options (suexec related)
%option with_suexec yes
@@ -148,7 +148,7 @@
%option with_mod_php_versioning no
%option with_mod_php_wddx no
%option with_mod_php_xml no
-%option with_mod_php_xslt no
+%option with_mod_php_xsl no
%option with_mod_php_zlib no
# package options (braindead ones only)
@@ -183,6 +183,12 @@
%undefine with_gdbm_ndbm
%define with_gdbm_ndbm yes
%endif
+%if "%{with_mod_php_xsl}" == "yes"
+%undefine with_mod_php_dom
+%undefine with_mod_php_xml
+%define with_mod_php_dom yes
+%define with_mod_php_xml yes
+%endif
%endif
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_define
@@ -333,9 +339,9 @@
BuildPreReq: libxml
PreReq: libxml
%endif
-%if "%{with_mod_php_xslt}" == "yes"
-BuildPreReq: libxslt
-PreReq: libxslt
+%if "%{with_mod_php_xsl}" == "yes"
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
%endif
%if "%{with_mod_php_dom}" == "yes"
BuildPreReq: libxml, libxslt
@@ -860,7 +866,7 @@
%else
--disable-xml \
%endif
-%if "%{with_mod_php_xslt}" == "yes"
+%if "%{with_mod_php_xsl}" == "yes"
--with-xsl=%{l_prefix} \
%else
--without-xsl \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
