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 Date: 12-Feb-2004 09:20:26
Branch: HEAD Handle: 2004021208202500
Modified files:
openpkg-src/apache apache.spec
Log:
be smart and do not require an MTA for a scripting language by
default; also remove obsolete patching part
Summary:
Revision Changes Path
1.209 +11 -6 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.208 -r1.209 apache.spec
--- openpkg-src/apache/apache.spec 7 Feb 2004 17:53:24 -0000 1.208
+++ openpkg-src/apache/apache.spec 12 Feb 2004 08:20:25 -0000 1.209
@@ -62,7 +62,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040207
+Release: 20040212
# package options (suexec related)
%option with_suexec yes
@@ -131,6 +131,7 @@
%option with_mod_php_pear no
%option with_mod_php_exif no
%option with_mod_php_iconv no
+%option with_mod_php_sendmail no
# package options (braindead ones only)
%option with_gdbm_ndbm yes
@@ -310,6 +311,10 @@
BuildPreReq: libiconv
PreReq: libiconv
%endif
+%if "%{with_mod_php_sendmail}" == "yes"
+BuildPreReq: MTA
+PreReq: MTA
+%endif
%endif
%if "%{with_mod_auth_ldap}" == "yes"
BuildPreReq: openldap, openssl
@@ -594,7 +599,11 @@
-e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
configure
%endif
- PROG_SENDMAIL="%{l_prefix}/sbin/sendmail"
+%if "%{with_mod_php_sendmail}" == "yes"
+ PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
+%else
+ PROG_SENDMAIL="`%{l_shtool} path false`" \
+%endif
export PROG_SENDMAIL
./configure \
--prefix=%{l_prefix} \
@@ -737,10 +746,6 @@
--enable-inline-optimization \
--enable-track-vars
%{l_make} %{l_mflags}
- %{l_shtool} subst \
- -e "s;^\\(EXTENSION_DIR = \\)\\(%{l_prefix}\\);\\1$RPM_BUILD_ROOT\\2;" \
- -e "s;^\\(PEAR_INSTALLDIR = \\)\\(%{l_prefix}\\);\\1$RPM_BUILD_ROOT\\2;" \
- config_vars.mk
%{l_make} %{l_mflags} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
