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

[ji...@apache.org]

Author: jim
Date: Tue Jan 25 19:37:47 2011
New Revision: 1063419

URL: http://svn.apache.org/viewvc?rev=1063419&view=rev
Log:
Make worker the default MPM for 2.3/2.4

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

Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1063419&r1=1063418&r2=1063419&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Tue Jan 25 19:37:47 2011
@@ -1,7 +1,7 @@
 %define contentdir /var/www
 %define suexec_caller apache
 %define mmn APACHE_MMN
-%define mpms worker event
+%define mpms prefork event
 
 Summary: Apache HTTP Server
 Name: httpd
@@ -119,8 +119,8 @@ make %{?_smp_mflags}
 popd
 }
 
-# Build everything and the kitchen sink with the prefork build
-mpmbuild prefork \
+# Build everything and the kitchen sink with the worker build
+mpmbuild worker \
         --enable-mods-shared=all \
         --enable-ssl --with-ssl --enable-distcache \
         --enable-proxy \
@@ -141,7 +141,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd prefork
+pushd worker
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
@@ -246,10 +246,10 @@ if readelf -d $RPM_BUILD_ROOT%{_libdir}/
 fi
 
 # Verify that the same modules were built into the httpd binaries
-./prefork/httpd -l | grep -v prefork > prefork.mods
+./worker/httpd -l | grep -v worker > worker.mods
 for mpm in %{mpms}; do
   ./${mpm}/httpd -l | grep -v ${mpm} > ${mpm}.mods
-  if ! diff -u prefork.mods ${mpm}.mods; then
+  if ! diff -u worker.mods ${mpm}.mods; then
     : Different modules built into httpd binaries, will not proceed
     exit 1
   fi