OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Apr-2004 10:39:34
Branch: HEAD Handle: 2004042009393400
Modified files:
openpkg-src/apache apache.spec
Log:
With mod_php enabled, provide the module itself only and skip the
rest; PEAR is to be provided by 'php' package
Summary:
Revision Changes Path
1.222 +4 -8 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.221 -r1.222 apache.spec
--- openpkg-src/apache/apache.spec 16 Apr 2004 07:20:41 -0000 1.221
+++ openpkg-src/apache/apache.spec 20 Apr 2004 08:39:34 -0000 1.222
@@ -64,7 +64,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040416
+Release: 20040420
# package options (suexec related)
%option with_suexec yes
@@ -99,6 +99,8 @@
%option with_mod_dosevasive no
# package options (optional PHP4 specific settings; requires "with_mod_php")
+# please not the lack of an PEAR option since PEAR is to be provided by
+# the 'php' package
%option with_mod_php_calendar no
%option with_mod_php_mysql no
%option with_mod_php_pgsql no
@@ -133,7 +135,6 @@
%option with_mod_php_odbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
-%option with_mod_php_pear no
%option with_mod_php_exif no
%option with_mod_php_iconv no
%option with_mod_php_sendmail no
@@ -774,13 +775,8 @@
%if "%{with_mod_php_iconv}" == "yes"
--with-iconv=%{l_prefix} \
%endif
-%if "%{with_mod_php_pear}" == "yes"
- --enable-cli \
- --with-pear \
-%else
--disable-cli \
--without-pear \
-%endif
--disable-shared \
--enable-inline-optimization \
--enable-track-vars
@@ -1134,7 +1130,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
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/{php-config,phpextdist,phpize}
%endif
# optionally install suPHP wrapper binary
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
