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: 09-Jun-2006 09:09:17
Branch: HEAD Handle: 2006060908091600
Modified files:
openpkg-src/apache apache.spec
Log:
added an option for mod_define, which comes as part of the mod_ssl
distribution, to be installed solely without mod_ssl
Summary:
Revision Changes Path
1.334 +33 -11 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.333 -r1.334 apache.spec
--- openpkg-src/apache/apache.spec 8 Jun 2006 11:40:12 -0000 1.333
+++ openpkg-src/apache/apache.spec 9 Jun 2006 07:09:16 -0000 1.334
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060608
+Release: 20060609
# package options (suexec related)
%option with_suexec yes
@@ -81,6 +81,7 @@
# package options (additionally used Apache modules; can be enabled
without thinking)
%option with_mod_ssl no
+%option with_mod_define no
%option with_mod_perl no
%option with_mod_php no
%option with_mod_dav no
@@ -178,6 +179,10 @@
%define with_gdbm_ndbm yes
%endif
%endif
+%if "%{with_mod_ssl}" == "yes"
+%undefine with_mod_define
+%define with_mod_define yes
+%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -218,8 +223,10 @@
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
%if "%{with_mod_ssl}" == "yes"
-BuildPreReq: openssl, mm
-PreReq: openssl, mm
+BuildPreReq: mm
+PreReq: mm
+BuildPreReq: openssl
+PreReq: openssl
%endif
%if "%{with_mod_perl}" == "yes"
BuildPreReq: perl
@@ -500,7 +507,7 @@
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
%setup -q -T -D -a 1
%endif
%if "%{with_mod_perl}" == "yes"
@@ -590,11 +597,14 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
- # optionally prepare mod_ssl
-%if "%{with_mod_ssl}" == "yes"
+ # optionally prepare mod_ssl or mod_define
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
( cd mod_ssl-%{V_mod_ssl}
./configure \
--with-apache=../apache_%{V_apache} \
+%if "%{with_mod_ssl}" != "yes"
+ --with-eapi-only \
+%endif
--expert --force
) || exit $?
%endif
@@ -609,7 +619,7 @@
CFLAGS="%{l_cflags -O}" \
%endif
./configure \
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
--enable-rule=EAPI \
%endif
%if "%{with_shared_core}" == "yes"
@@ -676,7 +686,7 @@
LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
%endif
LIBS=""; export LIBS
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
%endif
%if "%{with_mod_php_gd}" == "yes"
@@ -866,13 +876,13 @@
( cd mod_dav-%{V_mod_dav}
CC="%{l_cc}" \
%if "%{with_debug}" == "yes"
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
CFLAGS="%{l_cflags} -g -DEAPI" \
%else
CFLAGS="%{l_cflags} -g" \
%endif
%else
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
CFLAGS="%{l_cflags -O} -DEAPI" \
%else
CFLAGS="%{l_cflags -O}" \
@@ -988,6 +998,13 @@
) || exit $?
%endif
+ # optionally prepare mod_define (if mod_ssl is disabled only)
+%if "%{with_mod_define}" == "yes" && "%{with_mod_ssl}" != "yes"
+ ( cd mod_ssl-%{V_mod_ssl}/pkg.addon
+ cp mod_define.c ../../apache_%{V_apache}/src/modules/extra/
+ ) || exit $?
+%endif
+
# optionally prepare mod_suphp
%if "%{with_suphp}" == "yes"
( cd suphp-%{V_suphp}
@@ -1110,10 +1127,15 @@
%endif
--enable-module=most \
--with-perl=%{l_prefix}/bin/perl \
-%if "%{with_mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes" || "%{with_mod_define}" == "yes"
--enable-rule=EAPI \
+%if "%{with_mod_ssl}" == "yes"
--enable-module=ssl \
%endif
+%if "%{with_mod_define}" == "yes" && "%{with_mod_ssl}" != "yes"
+ --activate-module=src/modules/extra/mod_define.o \
+%endif
+%endif
%if "%{with_mod_perl}" == "yes"
--activate-module=src/modules/perl/libperl.a \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
