Major overhauling of Apache specification by consistencly use with_xxx as the option variables, by adding comments, etc.

apache/apache.spec

@@ -33,68 +33,51 @@
 ##  go with the macro mechanism. But do not try to repeat this!
 
 #   the additionally used Apache modules (can be enabled without thinking)
-%ifndef       mod_ssl
-%define       mod_ssl              no
-%endif
-%ifndef       mod_perl
-%define       mod_perl             no
-%endif
-%ifndef       mod_php
-%define       mod_php              no
-%endif
-%ifndef       mod_dav
-%define       mod_dav              no
-%endif
-%ifndef       mod_layout
-%define       mod_layout           no
-%endif
-%ifndef       mod_macro
-%define       mod_macro            no
-%endif
+%{!?with_mod_ssl:            %define  with_mod_ssl            no}
+%{!?with_mod_perl:           %define  with_mod_perl           no}
+%{!?with_mod_php:            %define  with_mod_php            no}
+%{!?with_mod_dav:            %define  with_mod_dav            no}
+%{!?with_mod_layout:         %define  with_mod_layout         no}
+%{!?with_mod_macro:          %define  with_mod_macro          no}
 
 #   the additionally used Apache modules (you have to know what you do)
-%ifndef       mod_auth_pam
-%define       mod_auth_pam         no
-%endif
-%ifndef       mod_gzip
-%define       mod_gzip             no
-%endif
-%ifndef       mod_zmod
-%define       mod_zmod             no
-%endif
-%ifndef       mod_fastcgi
-%define       mod_fastcgi          no
-%endif
-%ifndef       mod_throttle
-%define       mod_throttle         no
-%endif
-%ifndef       mod_access_referer
-%define       mod_access_referer   no
+%{!?with_mod_auth_pam:       %define  with_mod_auth_pam       no}
+%{!?with_mod_gzip:           %define  with_mod_gzip           no}
+%{!?with_mod_zmod:           %define  with_mod_zmod           no}
+%{!?with_mod_fastcgi:        %define  with_mod_fastcgi        no}
+%{!?with_mod_throttle:       %define  with_mod_throttle       no}
+%{!?with_mod_access_referer: %define  with_mod_access_referer no}
+%{!?with_mod_roaming:        %define  with_mod_roaming        no}
+%{!?with_mod_relocate:       %define  with_mod_relocate       no}
+
+#   more optional settings 
+#   (requires "with_mod_php" set to "yes" above!)
+%{!?with_mod_php_mysql:      %define  with_mod_php_mysql      no}
+%{!?with_mod_php_gd:         %define  with_mod_php_gd         no}
+%{!?with_mod_php_db:         %define  with_mod_php_db         no}
+%{!?with_mod_php_pdflib:     %define  with_mod_php_pdflib     no}
+%{!?with_mod_php_zlib:       %define  with_mod_php_zlib       no}
+%{!?with_mod_php_bzip2:      %define  with_mod_php_bzip2      no}
+%{!?with_mod_php_openssl:    %define  with_mod_php_openssl    no}
+%{!?with_mod_php_openldap:   %define  with_mod_php_openldap   no}
+%{!?with_mod_php_mm:         %define  with_mod_php_mm         no}
+%{!?with_mod_php_pcre:       %define  with_mod_php_pcre       no}
+%{!?with_mod_php_ftp:        %define  with_mod_php_ftp        no}
+%{!?with_mod_php_java:       %define  with_mod_php_java       no}
+%{!?with_mod_php_oci8:       %define  with_mod_php_oci8       no}
+
+#   fixing implicit inter-module dependencies and correlations
+%if "%{with_mod_php}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
+%define with_php_openssl yes
+%define with_php_mm      yes
 %endif
-%ifndef       mod_roaming
-%define       mod_roaming          no
+%if "%{with_mod_php_mysql}" == "yes"
+%define with_php_zlib    yes
 %endif
-%ifndef       mod_relocate
-%define       mod_relocate         no
 %endif
 
-#   more optional settings 
-#   (requires mod_php set to "yes" above)
-%define       php_mysql            no
-%define       php_gd               no
-%define       php_db               no
-%define       php_pdflib           no
-%define       php_zlib             no
-%define       php_bzip2            no
-%define       php_openssl          no
-%define       php_openldap         no
-%define       php_mm               no
-%define       php_pcre             no
-%define       php_ftp              no
-%define       php_java             no
-%define       php_oci8             no
-
-#   the software versions
+#   package component versions
 %define       V_apache             1.3.23
 %define       V_mod_ssl            2.8.7
 %define       V_mod_perl           1.26
@@ -111,11 +94,6 @@
 %define       V_mod_roaming        1.0.2
 %define       V_mod_relocate       1.0
 
-#   fixing some implicit inter-module dependencies
-%if "%{php_mysql}" == "yes"
-%define       php_zlib             yes
-%endif
-
 #   package information
 Name:         apache
 Summary:      Apache HTTP Server
@@ -126,52 +104,24 @@ Distribution: OpenPKG [REL]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20020318
+Release:      20020320
 
 #   list of sources
 Source0:      http://httpd.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
-# %if "%{mod_ssl}" == "yes"
 Source1:      http://www.modssl.org/source/mod_ssl-%{V_mod_ssl}-%{V_apache}.tar.gz
-# %endif
-# %if "%{mod_perl}" == "yes"
 Source2:      http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
-# %endif
-# %if "%{mod_php}" == "yes"
 Source3:      http://www.php.net/distributions/php-%{V_mod_php}.tar.gz
-# %endif
-# %if "%{mod_dav}" == "yes"
 Source4:      http://www.webdav.org/mod_dav/mod_dav-%{V_mod_dav}.tar.gz
-# %endif
-# %if "%{mod_layout}" == "yes"
 Source5:      ftp://ftp.tangent.org/pub/apache/mod_layout-%{V_mod_layout}.tar.gz
-# %endif
-# %if "%{mod_macro}" == "yes"
 Source6:      http://www.cri.ensmp.fr/~coelho/mod_macro/mod_macro-%{V_mod_macro}.tar.gz
-# %endif
-# %if "%{mod_auth_pam}" == "yes"
 Source7:      http://pam.sourceforge.net/mod_auth_pam/mod_auth_pam.tar.gz
-# %endif
-# %if "%{mod_gzip}" == "yes"
 Source8:      http://www.remotecommunications.com/apache/mod_gzip/src/%{V_mod_gzip}/mod_gzip.c
-# %endif
-# %if "%{mod_zmod}" == "yes"
 Source9:      http://www.ivw.de/???/src.apapi.FIN%{V_mod_zmod}.tar.gz
-# %endif
-# %if "%{mod_fastcgi}" == "yes"
 Source10:     http://www.fastcgi.com/dist/mod_fastcgi-%{V_mod_fastcgi}.tar.gz
-# %endif
-# %if "%{mod_throttle}" == "yes"
 Source11:     http://www.snert.com/Software/mod_throttle/mod_throttle%{V_mod_throttle}.tgz
-# %endif
-# %if "%{mod_access_referer}" == "yes"
 Source12:     http://download.sourceforge.net/accessreferer/mod_access_referer-%{V_mod_access_referer}.tar.gz
-# %endif
-# %if "%{mod_roaming}" == "yes"
 Source13:     http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz
-# %endif
-# %if "%{mod_relocate}" == "yes"
 Source14:     http://www.tangent.org/mod_relocate/mod_relocate-%{V_mod_relocate}.tar.gz
-# %endif
 Source20:     apache.conf
 Source21:     apache.base
 Source22:     apache.vhost
@@ -182,50 +132,50 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  openpkg >= 20020222
 PreReq:       openpkg >= 20020222
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
 BuildPreReq:  openssl, mm
 %endif
-%if "%{mod_perl}" == "yes"
+%if "%{with_mod_perl}" == "yes"
 BuildPreReq:  perl
 PreReq:       perl
 %endif
-%if "%{mod_php}" == "yes"
+%if "%{with_mod_php}" == "yes"
 BuildPreReq:  make, bison, flex
-%if "%{php_mysql}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes"
 BuildPreReq:  mysql
 %endif
-%if "%{php_gd}" == "yes"
+%if "%{with_mod_php_gd}" == "yes"
 BuildPreReq:  gd
 %endif
-%if "%{php_db}" == "yes"
+%if "%{with_mod_php_db}" == "yes"
 BuildPreReq:  db
 %endif
-%if "%{php_pdflib}" == "yes"
+%if "%{with_mod_php_pdflib}" == "yes"
 BuildPreReq:  pdflib, zlib
 %endif
-%if "%{php_zlib}" == "yes"
+%if "%{with_mod_php_zlib}" == "yes"
 BuildPreReq:  zlib
 %endif
-%if "%{php_bzip2}" == "yes"
+%if "%{with_mod_php_bzip2}" == "yes"
 BuildPreReq:  bzip2
 %endif
-%if "%{php_openssl}" == "yes"
+%if "%{with_mod_php_openssl}" == "yes"
 BuildPreReq:  openssl
 %endif
-%if "%{php_openldap}" == "yes"
+%if "%{with_mod_php_openldap}" == "yes"
 BuildPreReq:  openldap, openssl
 %endif
-%if "%{php_mm}" == "yes"
+%if "%{with_mod_php_mm}" == "yes"
 BuildPreReq:  mm
 %endif
-%if "%{php_pcre}" == "yes"
+%if "%{with_mod_php_pcre}" == "yes"
 BuildPreReq:  pcre
 %endif
-%if "%{php_java}" == "yes"
+%if "%{with_mod_php_java}" == "yes"
 BuildPreReq:  jdk-sun
 %endif
 %endif
-%if "%{mod_auth_pam}" == "yes"
+%if "%{with_mod_auth_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
 %endif
@@ -242,81 +192,89 @@ AutoReqProv:  no
     volunteers are known as the Apache Group. In addition, hundreds
     of users have contributed ideas, code, and documentation to the
     project.
+   
+    Options (additional modules I):
+    with_mod_ssl=%{with_mod_ssl} with_mod_perl=%{with_mod_perl} with_mod_php=%{with_mod_php}
+    with_mod_dav=%{with_mod_dav} with_mod_layout=%{with_mod_layout} with_mod_macro=%{with_mod_macro}
+
+    Options (additional modules II):
+    with_mod_auth_pam=%{with_mod_auth_pam} with_mod_gzip=%{with_mod_gzip} with_mod_zmod=%{with_mod_zmod}
+    with_mod_fastcgi=%{with_mod_fastcgi} with_mod_throttle=%{with_mod_throttle} with_mod_access_referer=%{with_mod_access_referer}
+    with_mod_roaming=%{with_mod_roaming} with_mod_relocate=%{with_mod_relocate}
 
-    This Apache %{V_apache} package optionally can include:
-    - mod_ssl %{V_mod_ssl} for HTTPS support.
-    - mod_perl %{V_mod_perl} for dynamic Perl scripting.
-    - mod_php %{V_mod_php} for dynamic PHP scripting.
-    - mod_dav %{V_mod_dav} for WebDAV support.
-    - mod_layout %{V_mod_layout} for header/footer support.
-    - mod_macro %{V_mod_macro} for macro support in config files.
-    - mod_auth_pam %{V_mod_auth_pam} for PAM-based authentication.
-    - mod_gzip %{V_mod_gzip} for on-the-fly GZIP-based data compression.
-    - mod_zmod %{V_mod_zmod} for IVW-compliant logfile writing.
-    - mod_fastcgi %{V_mod_fastcgi} for FastCGI support.
-    - mod_access_referer %{V_mod_access_referer} for access control via HTTP Referer.
-    - mod_roaming %{V_mod_roaming} for Netscape Communicator roaming support.
-    - mod_relocate %{V_mod_relocate} for external URL redirection with logging.
+    Options (additional extensions for mod_php):
+    with_mod_php_mysql=%{with_mod_php_mysql} with_mod_php_gd=%{with_mod_php_gd} with_mod_php_db=%{with_mod_php_db}
+    with_mod_php_pdflib=%{with_mod_php_pdflib} with_mod_php_zlib=%{with_mod_php_zlib} with_mod_php_bzip2=%{with_mod_php_bzip2}
+    with_mod_php_openssl=%{with_mod_php_openssl} with_mod_php_openldap=%{with_mod_php_openldap} with_mod_php_mm=%{with_mod_php_mm}
+    with_mod_php_pcre=%{with_mod_php_pcre} with_mod_php_ftp=%{with_mod_php_ftp} with_mod_php_java=%{with_mod_php_java}
+    with_mod_php_oci8=%{with_mod_php_oci8}
 
 %prep
+    #   unpack Apache distribution
     %setup0 -q -c
-%if "%{mod_ssl}" == "yes"
+    #   unpack optional extension modules
+%if "%{with_mod_ssl}" == "yes"
     %setup1 -q -T -D -a 1
 %endif
-%if "%{mod_perl}" == "yes"
+%if "%{with_mod_perl}" == "yes"
     %setup2 -q -T -D -a 2
 %endif
-%if "%{mod_php}" == "yes"
+%if "%{with_mod_php}" == "yes"
     %setup3 -q -T -D -a 3
 %endif
-%if "%{mod_dav}" == "yes"
+%if "%{with_mod_dav}" == "yes"
     %setup4 -q -T -D -a 4
 %endif
-%if "%{mod_layout}" == "yes"
+%if "%{with_mod_layout}" == "yes"
     %setup5 -q -T -D -a 5
 %endif
-%if "%{mod_macro}" == "yes"
+%if "%{with_mod_macro}" == "yes"
     %setup6 -q -T -D -a 6
 %endif
-%if "%{mod_auth_pam}" == "yes"
+%if "%{with_mod_auth_pam}" == "yes"
     %setup7 -q -T -D -a 7
 %endif
-%if "%{mod_zmod}" == "yes"
+%if "%{with_mod_zmod}" == "yes"
     %setup9 -q -T -D -a 9
 %endif
-%if "%{mod_fastcgi}" == "yes"
+%if "%{with_mod_fastcgi}" == "yes"
     %setup10 -q -T -D -a 10
 %endif
-%if "%{mod_throttle}" == "yes"
+%if "%{with_mod_throttle}" == "yes"
     %setup11 -q -T -D -a 11
 %endif
-%if "%{mod_access_referer}" == "yes"
+%if "%{with_mod_access_referer}" == "yes"
     %setup12 -q -T -D -a 12
 %endif
-%if "%{mod_roaming}" == "yes"
+%if "%{with_mod_roaming}" == "yes"
     %setup13 -q -T -D -a 13
 %endif
-%if "%{mod_relocate}" == "yes"
+%if "%{with_mod_relocate}" == "yes"
     %setup14 -q -T -D -a 14
 %endif
 
 %build
+    #   prepare environment
     PATH="%{l_prefix}/bin:%{l_prefix}/sbin:$PATH"; export PATH
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
-%if "%{mod_ssl}" == "yes"
+
+    #   optionally prepare mod_ssl
+%if "%{with_mod_ssl}" == "yes"
     ( cd mod_ssl-%{V_mod_ssl}-%{V_apache}
       ./configure \
           --with-apache=../apache_%{V_apache} \
           --expert
     )
 %endif
-%if "%{mod_php}" == "yes" || "%{mod_dav}" == "yes"
+
+    #   optionally pre-configure Apache for mod_php and mod_dav
+%if "%{with_mod_php}" == "yes" || "%{with_mod_dav}" == "yes"
     ( cd apache_%{V_apache}
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       ./configure \
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
           --enable-rule=EAPI \
 %endif
           --target=apache \
@@ -329,7 +287,9 @@ AutoReqProv:  no
           --localstatedir=%{l_prefix}/var/apache
     )
 %endif
-%if "%{mod_perl}" == "yes"
+
+    #   optionally prepare mod_perl
+%if "%{with_mod_perl}" == "yes"
     ( cd mod_perl-%{V_mod_perl}
       eval `%{l_prefix}/bin/perl -V:archname`
       eval `%{l_prefix}/bin/perl -V:version`
@@ -362,61 +322,63 @@ AutoReqProv:  no
           ../apache_%{V_apache}/src/modules/perl/mod_perl.config
     )
 %endif
-%if "%{mod_php}" == "yes"
+
+    #   optionally prepare mod_php
+%if "%{with_mod_php}" == "yes"
     ( cd php-%{V_mod_php}
       CC="%{l_cc}" \
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
       CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -DEAPI" \
 %else
       CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
 %endif
       CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
       LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib" \
-%if "%{php_gd}" == "yes"
+%if "%{with_mod_php_gd}" == "yes"
       LIBS="-lpng -lz" \
 %endif
       ./configure \
           --prefix=%{l_prefix} \
           --with-apache=../apache_%{V_apache} \
           --with-config-file-path=%{l_prefix}/etc/apache \
-%if "%{php_mysql}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes"
           --with-mysql=%{l_prefix} \
 %endif
-%if "%{php_gd}" == "yes"
+%if "%{with_mod_php_gd}" == "yes"
           --with-gd=%{l_prefix} \
 %endif
-%if "%{php_db}" == "yes"
+%if "%{with_mod_php_db}" == "yes"
           --with-db3=%{l_prefix} \
 %endif
-%if "%{php_zlib}" == "yes" || "%{php_pdflib}" == "yes"
+%if "%{with_mod_php_zlib}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
           --with-zlib=%{l_prefix} \
 %endif
-%if "%{php_bzip2}" == "yes"
+%if "%{with_mod_php_bzip2}" == "yes"
           --with-bz2=%{l_prefix} \
 %endif
-%if "%{php_pdflib}" == "yes"
+%if "%{with_mod_php_pdflib}" == "yes"
           --with-pdflib=%{l_prefix} \
 %endif
-%if "%{php_openssl}" == "yes" || "%{php_openldap}" == "yes"
+%if "%{with_mod_php_openssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
           --with-openssl=%{l_prefix} \
 %endif
-%if "%{php_openldap}" == "yes"
+%if "%{with_mod_php_openldap}" == "yes"
           --with-ldap=%{l_prefix} \
 %endif
-%if "%{php_mm}" == "yes"
+%if "%{with_mod_php_mm}" == "yes"
           --with-mm=%{l_prefix} \
           --enable-session \
 %endif
-%if "%{php_pcre}" == "yes"
+%if "%{with_mod_php_pcre}" == "yes"
           --with-pcre=%{l_prefix} \
 %endif
-%if "%{php_ftp}" == "yes"
+%if "%{with_mod_php_ftp}" == "yes"
           --enable-ftp \
 %endif
-%if "%{php_java}" == "yes"
+%if "%{with_mod_php_java}" == "yes"
           --with-java=%{l_prefix}/libexec/jdk-sun \
 %endif
-%if "%{php_oci8}" == "yes"
+%if "%{with_mod_php_oci8}" == "yes"
           --with-oci8 \
 %endif
           --disable-shared \
@@ -430,10 +392,12 @@ AutoReqProv:  no
           prefix=$RPM_BUILD_ROOT%{l_prefix}
     )
 %endif
-%if "%{mod_dav}" == "yes"
+
+    #   optionally prepare mod_dav
+%if "%{with_mod_dav}" == "yes"
     ( cd mod_dav-%{V_mod_dav}
       CC="%{l_cc}" \
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
       CFLAGS="%{l_cflags -O}" \
 %else
       CFLAGS="%{l_cflags -O} -DEAPI" \
@@ -445,59 +409,81 @@ AutoReqProv:  no
       %{l_make} %{l_mflags} install
     )
 %endif
-%if "%{mod_layout}" == "yes"
+
+    #   optionally prepare mod_layout
+%if "%{with_mod_layout}" == "yes"
     ( cd mod_layout-%{V_mod_layout}
       mkdir ../apache_%{V_apache}/src/modules/layout
       cp * ../apache_%{V_apache}/src/modules/layout/ 2>/dev/null || true
       chmod -R u+w ../apache_%{V_apache}/src/modules/layout
     )
 %endif
-%if "%{mod_macro}" == "yes"
+
+    #   optionally prepare mod_macro
+%if "%{with_mod_macro}" == "yes"
     ( cd mod_macro-%{V_mod_macro}
       cp mod_macro.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
-%if "%{mod_auth_pam}" == "yes"
+
+    #   optionally prepare mod_auth_pam
+%if "%{with_mod_auth_pam}" == "yes"
     ( cd mod_auth_pam-%{V_mod_auth_pam}
       cp mod_auth_pam.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
-%if "%{mod_gzip}" == "yes"
+
+    #   optionally prepare mod_gzip
+%if "%{with_mod_gzip}" == "yes"
     cp %{SOURCE mod_gzip.c} apache_%{V_apache}/src/modules/extra/
 %endif
-%if "%{mod_zmod}" == "yes"
+
+    #   optionally prepare mod_zmod
+%if "%{with_mod_zmod}" == "yes"
     ( cd src
       mkdir ../apache_%{V_apache}/src/modules/zmod
       %{l_shtool} subst -e 's;"compat.h";"ap_compat.h";' modules/zmod/mod_zmod.c
       cp modules/zmod/* ../apache_%{V_apache}/src/modules/zmod/
     )
 %endif
-%if "%{mod_fastcgi}" == "yes"
+
+    #   optionally prepare mod_fastcgi
+%if "%{with_mod_fastcgi}" == "yes"
     ( cd mod_fastcgi-%{V_mod_fastcgi}
       mkdir ../apache_%{V_apache}/src/modules/fastcgi
       cp -rp * ../apache_%{V_apache}/src/modules/fastcgi/
     )
 %endif
-%if "%{mod_throttle}" == "yes"
+
+    #   optionally prepare mod_throttle
+%if "%{with_mod_throttle}" == "yes"
     ( cd mod_throttle-*
       cp mod_throttle.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
-%if "%{mod_access_referer}" == "yes"
+
+    #   optionally prepare mod_access_referer
+%if "%{with_mod_access_referer}" == "yes"
     ( cd mod_access_referer-%{V_mod_access_referer}
       cp mod_access_referer.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
-%if "%{mod_roaming}" == "yes"
+
+    #   optionally prepare mod_roaming
+%if "%{with_mod_roaming}" == "yes"
     ( cd mod_roaming-%{V_mod_roaming}
       cp mod_roaming.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
-%if "%{mod_relocate}" == "yes"
+
+    #   optionally prepare mod_relocate
+%if "%{with_mod_relocate}" == "yes"
     ( cd mod_relocate-%{V_mod_relocate}
       cp mod_relocate.c ../apache_%{V_apache}/src/modules/extra/
     )
 %endif
+
+    #   configure Apache
     ( cd apache_%{V_apache}
       cflags="%{l_cflags -O}"
       ldflags=""
@@ -511,7 +497,7 @@ AutoReqProv:  no
       CFLAGS="$cflags" \
       LDFLAGS="$ldflags" \
       LIBS="$libs" \
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
       EAPI_MM="%{l_prefix}" \
       SSL_BASE="%{l_prefix}" \
 %endif
@@ -529,47 +515,47 @@ AutoReqProv:  no
           --suexec-userdir=.www \
           --enable-module=most \
           --with-perl=%{l_prefix}/bin/perl \
-%if "%{mod_ssl}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
           --enable-rule=EAPI \
           --enable-module=ssl \
 %endif
-%if "%{mod_perl}" == "yes"
+%if "%{with_mod_perl}" == "yes"
           --activate-module=src/modules/perl/libperl.a \
 %endif
-%if "%{mod_php}" == "yes"
+%if "%{with_mod_php}" == "yes"
           --activate-module=src/modules/php4/libphp4.a \
 %endif
-%if "%{mod_dav}" == "yes"
+%if "%{with_mod_dav}" == "yes"
           --activate-module=src/modules/dav/libdav.a \
 %endif
-%if "%{mod_layout}" == "yes"
+%if "%{with_mod_layout}" == "yes"
           --activate-module=src/modules/layout/liblayout.a \
 %endif
-%if "%{mod_macro}" == "yes"
+%if "%{with_mod_macro}" == "yes"
           --activate-module=src/modules/extra/mod_macro.o \
 %endif
-%if "%{mod_auth_pam}" == "yes"
+%if "%{with_mod_auth_pam}" == "yes"
           --activate-module=src/modules/extra/mod_auth_pam.o \
 %endif
-%if "%{mod_gzip}" == "yes"
+%if "%{with_mod_gzip}" == "yes"
           --activate-module=src/modules/extra/mod_gzip.o \
 %endif
-%if "%{mod_zmod}" == "yes"
+%if "%{with_mod_zmod}" == "yes"
           --activate-module=src/modules/zmod/libzmod.a \
 %endif
-%if "%{mod_fastcgi}" == "yes"
+%if "%{with_mod_fastcgi}" == "yes"
           --activate-module=src/modules/fastcgi/libfastcgi.a \
 %endif
-%if "%{mod_throttle}" == "yes"
+%if "%{with_mod_throttle}" == "yes"
           --activate-module=src/modules/extra/mod_throttle.o \
 %endif
-%if "%{mod_access_referer}" == "yes"
+%if "%{with_mod_access_referer}" == "yes"
           --activate-module=src/modules/extra/mod_access_referer.o \
 %endif
-%if "%{mod_roaming}" == "yes"
+%if "%{with_mod_roaming}" == "yes"
           --activate-module=src/modules/extra/mod_roaming.o \
 %endif
-%if "%{mod_relocate}" == "yes"
+%if "%{with_mod_relocate}" == "yes"
           --activate-module=src/modules/extra/mod_relocate.o \
 %endif
           --enable-module=so
@@ -577,8 +563,11 @@ AutoReqProv:  no
     )
 
 %install
+    #   install Apache
     ( cd apache_%{V_apache}
+      #   perform standard Apache installation procedure
       %{l_make} %{l_mflags} install root=$RPM_BUILD_ROOT
+      #   post-adjustments to installation tree
       mv $RPM_BUILD_ROOT%{l_prefix}/share/apache/icons/small/* \
          $RPM_BUILD_ROOT%{l_prefix}/share/apache/icons/
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/apache/icons/small
@@ -594,9 +583,13 @@ AutoReqProv:  no
          $RPM_BUILD_ROOT%{l_prefix}/cgi/
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
     )
-%if "%{mod_perl}" == "yes"
+
+    #   optionally cleanup for mod_perl
+%if "%{with_mod_perl}" == "yes"
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/perl
 %endif
+
+    #   create default configuration
     l_hostname=`%{l_shtool} echo -e %h`
     l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
     %{l_shtool} install -c -m 644 \
@@ -612,14 +605,17 @@ AutoReqProv:  no
     mv $RPM_BUILD_ROOT%{l_prefix}/etc/apache/magic $RPM_BUILD_ROOT%{l_prefix}/etc/apache/mime.magic
     find $RPM_BUILD_ROOT%{l_prefix} -name perllocal.pod -print | xargs rm -f
 
+    #   create run-command script
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g'    \
         -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g'  \
         %{SOURCE rc.apache} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
+    #   strip installation binaries
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/*  2> /dev/null || true
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2> /dev/null || true
 
+    #   determine installation tree files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%attr(4755,root,%{l_mgrp}) %{l_prefix}/sbin/suexec' \
@@ -632,7 +628,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
 
 %post
-%if "%{mod_auth_pam}" == "yes"
+%if "%{with_mod_auth_pam}" == "yes"
     #   add PAM configuration entry
     if [ $1 -eq 1 ]; then
         $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "apache"
@@ -640,7 +636,7 @@ AutoReqProv:  no
 %endif
 
 %preun
-%if "%{mod_auth_pam}" == "yes"
+%if "%{with_mod_auth_pam}" == "yes"
     #   remove PAM configuration entry
     if [ $1 -eq 0 ]; then
         $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "apache"