Remove the obsolete serial attribute from the RPM spec file. Compile

against the external pcre. Add missing binaries fcgistarter, and
mod_socache* and mod_session*.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724162 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ed982bc7b2598b648dec2fc094f0720feb1a46d9..31c1a92f7f5cb44c72986c75888e2057a79e76c0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                         -*- coding: utf-8 -*-
-Changes with Apache 2.3.0
+Changes with Apache 2.3.1
 [ When backported to 2.2.x, remove entry from this file ]
+
+  *) Remove the obsolete serial attribute from the RPM spec file. Compile
+     against the external pcre. Add missing binaries fcgistarter, and
+     mod_socache* and mod_session*. [Graham Leggett]
+
+Changes with Apache 2.3.0
  
   *) mod_cache: When an explicit Expires or Cache-Control header is set, cache 
      normally non-cacheable response statuses. PR 46346. 

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 682c1108ef7f877a2cfa606d386cc737d2d8ca00..a6731c70d4b89d9cd33f6ca887993821834034e7 100644 (file)
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -60,7 +60,6 @@ also be found at http://httpd.apache.org/docs/.
 %package -n mod_ssl
 Group: System Environment/Daemons
 Summary: SSL/TLS module for the Apache HTTP server
-Serial: 1
 BuildPrereq: openssl-devel
 Prereq: openssl, dev, /bin/cat
 Requires: httpd, make, httpd-mmn = %{mmn}
@@ -81,9 +80,6 @@ if test x${vmmn} != x%{mmn}; then
    exit 1
 fi
 
-# regenerate configure scripts
-./buildconf
-
 # Before configure; fix location of build dir in generated apxs
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
        support/apxs.in
@@ -113,6 +109,7 @@ EOF
        --prefix=%{_sysconfdir}/httpd \
         --with-apr=/usr/bin/apr-1-config \
         --with-apr-util=/usr/bin/apu-1-config \
+        --with-pcre=/usr/bin/pcre-config \
         --exec-prefix=%{_prefix} \
        --bindir=%{_bindir} \
        --sbindir=%{_sbindir} \
@@ -136,6 +133,8 @@ EOF
        --enable-deflate --enable-cgid \
        --enable-proxy --enable-proxy-connect \
        --enable-proxy-http --enable-proxy-ftp \
+        --enable-session --enable-session-cookie \
+        --enable-session-dbd \
        $*
 
 make %{?_smp_mflags}
@@ -316,6 +315,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/rc.d/init.d/httpd
 
 %{_sbindir}/ab
+%{_sbindir}/fcgistarter
 %{_sbindir}/htcacheclean
 %{_sbindir}/htdbm
 %{_sbindir}/htdigest
@@ -332,7 +332,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/httpd/modules
 # everything but mod_ssl.so:
 %{_libdir}/httpd/modules/mod_[a-r]*.so
-%{_libdir}/httpd/modules/mod_s[petu]*.so
+%{_libdir}/httpd/modules/mod_s[opetu]*.so
 %{_libdir}/httpd/modules/mod_[t-z]*.so
 
 %dir %{contentdir}