SPECS: apache.spec - fix typo - complete suexec todo - cleanups

[glen]

Author: glen                         Date: Sun Dec 18 22:17:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix typo
- complete suexec todo
- cleanups

---- Files affected:
SPECS:
   apache.spec (1.440 -> 1.441) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.440 SPECS/apache.spec:1.441
--- SPECS/apache.spec:1.440	Sun Dec 18 21:45:44 2005
+++ SPECS/apache.spec	Sun Dec 18 23:16:59 2005
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - config examples for mod_*
-# - add %%post/%%postun to suexec
 # - --with-suexec-gidmin=500 or =100 ?
 # - --with-suexec-uidmin=500 or =1000 ?
 # - subpackages for MPMs
@@ -15,6 +14,7 @@
 # - same for mod_authz
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - drop mod_case_filter* or find summary and description for them
+# - build modules only once (not with each mpm)
 
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
@@ -38,7 +38,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.0
-Release:	0.77
+Release:	0.81
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -227,6 +227,7 @@
 Summary:	Apache suexec wrapper
 Summary(pl):	Wrapper suexec do serwera WWW Apache
 Group:		Networking/Daemons
+URL:		http://httpd.apache.org/docs/2.2/suexec.html
 Requires:	%{name}-base = %{version}-%{release}
 
 %description suexec
@@ -602,7 +603,7 @@
 Group:		Networking/Daemons
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	%{name}-mod_ldap  %{version}-%{release}
+Requires:	%{name}-mod_ldap = %{version}-%{release}
 Provides:	apache(mod_authnz_ldap) = %{version}-%{release}
 # compat
 Provides:	apache(mod_auth_ldap) = %{version}-%{release}
@@ -1659,10 +1660,8 @@
 
 %{__make}
 ./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
-
-find include -name '*.h' | xargs sed -i -e 's#/httpd\..*\.conf#%{_sysconfdir}/apache.conf#'
-
 cd ..
+
 done
 
 for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
@@ -1765,7 +1764,9 @@
 echo "LoadModule authz_default_module	modules/mod_authz_default.so" > $CFG/00_mod_authz_default.conf
 echo "LoadModule auth_basic_module	modules/mod_auth_basic.so" > $CFG/00_mod_auth_basic.conf
 echo "LoadModule dbd_module	modules/mod_dbd.so" > $CFG/00_mod_dbd.conf
+%if %{with bucketeer}
 echo "LoadModule bucketeer_module	modules/mod_bucketeer.so" > $CFG/00_mod_bucketeer.conf
+%endif
 echo "LoadModule dumpio_module	modules/mod_dumpio.so" > $CFG/00_mod_dumpio.conf
 echo "LoadModule echo_module	modules/mod_echo.so" > $CFG/00_mod_echo.conf
 echo "LoadModule case_filter_module	modules/mod_case_filter.so" > $CFG/00_mod_case_filter.conf
@@ -2014,6 +2015,7 @@
 %module_scripts mod_usertrack
 %module_scripts mod_version
 %module_scripts mod_vhost_alias
+%module_scripts suexec
 
 %post cgi_test
 if [ "$1" = "1" ]; then
@@ -2489,6 +2491,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441  2005/12/18 22:16:59  glen
+- fix typo
+- complete suexec todo
+- cleanups
+
 Revision 1.440  2005/12/18 20:45:44  glen
 - mod_authnz_ldap needs mod_ldap
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.440&r2=1.441&f=u