svn commit: r724162 - in /httpd/httpd/trunk: CHANGES build/rpm/httpd.spec.in

[mi...@apache.org]

Author: minfrin
Date: Sun Dec  7 09:47:53 2008
New Revision: 724162

URL: http://svn.apache.org/viewvc?rev=724162&view=rev
Log:
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*.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/build/rpm/httpd.spec.in

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=724162&r1=724161&r2=724162&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Dec  7 09:47:53 2008
@@ -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. 

Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=724162&r1=724161&r2=724162&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Sun Dec  7 09:47:53 2008
@@ -60,7 +60,6 @@
 %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 @@
    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 @@
  	--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 @@
 	--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 @@
 %config %{_sysconfdir}/rc.d/init.d/httpd
 
 %{_sbindir}/ab
+%{_sbindir}/fcgistarter
 %{_sbindir}/htcacheclean
 %{_sbindir}/htdbm
 %{_sbindir}/htdigest
@@ -332,7 +332,7 @@
 %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}