SPECS: apache.spec - bucketter bcond; dmbtools package; ldap fix

[arekm]

Author: arekm                        Date: Wed Dec 14 11:28:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bucketter bcond; dmbtools package; ldap fix

---- Files affected:
SPECS:
   apache.spec (1.428 -> 1.429) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.428 SPECS/apache.spec:1.429
--- SPECS/apache.spec:1.428	Wed Dec 14 12:08:43 2005
+++ SPECS/apache.spec	Wed Dec 14 12:28:47 2005
@@ -170,18 +170,13 @@
 #  /home/services/httpd/manual/vhosts/name-based.html.fr
 #  /usr/lib64/apache/build/config.nice
 #
-#   /usr/lib64/apache/mod_bucketeer.so
-#   /usr/sbin/dbmmanage
-#   /usr/sbin/htdbm
-#   /usr/share/man/man1/dbmmanage.1.gz
-#   /usr/share/man/man1/htdbm.1.gz
-#
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
 %bcond_without	ldap		# build without LDAP support
 %bcond_without	metuxmpm
 %bcond_without	peruser
 %bcond_with     distcache
+%bcond_with	bucketeer	# debug one
 #
 %include	/usr/lib/rpm/macros.perl
 # this is internal macro, don't change to %%apache_modules_api
@@ -634,6 +629,15 @@
 %description mod_autoindex -l pl
 Ten pakiet dostarcza moduł autoindex, który generuje indeks plików.
 
+%package mod_bucketeer
+Summary:	Split buckets whenever we find a control-char
+Group:		Networking/Daemons
+Provides:	apache(mod_bucketeer) = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
+
+%description mod_bucketeer
+Split buckets whenever we find a control-char.
+
 %package mod_cache
 Summary:	Content cache keyed to URIs
 Summary(pl):	Pamięć podręczna wg klucza URI
@@ -1058,6 +1062,14 @@
 Apache'a 2; ta wersja obsługuje hasła zapisane czystym tekstem oraz
 zakodowane algorytmami CRYPT (domyślnym), MD5 i SHA1.
 
+%package dbmtools
+Summary:	Apache 2 tools for manipulating DBM files
+Group:          Networking/Utilities
+Requires:       %{name} = %{version}-%{release}
+
+%description dbmtools
+Apache 2 tools for manipulating DBM files.
+
 %package cgi_test
 Summary:	cgi test/demo programs
 Summary(pl):	Programy testowe/przykładowe cgi
@@ -1150,7 +1162,7 @@
 	--enable-disk-cache \
 	--enable-mem-cache \
 	--enable-dbd \
-	--enable-bucketeer \
+	%{?with_bucketeer:--enable-bucketeer} \
 	--enable-dumpio \
 	--enable-echo \
 	--enable-charset-lite \
@@ -1929,10 +1941,12 @@
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
 %attr(755,root,root) %{_libexecdir}/mod_authn_file.so
 
+%if %{with ldap}
 %files mod_authnz_ldap
 %defattr(644,root,root,755)
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
 %attr(755,root,root) %{_libexecdir}/mod_authnz_ldap.so
+%endif
 
 %files mod_authz_dbm
 %defattr(644,root,root,755)
@@ -1969,10 +1983,12 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_autoindex.conf
 %attr(755,root,root) %{_libexecdir}/mod_autoindex.so
 
-#%files mod_bucketeer
-#%defattr(644,root,root,755)
+%if %{with bucketeer}
+%files mod_bucketeer
+%defattr(644,root,root,755)
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
-#%attr(755,root,root) %{_libexecdir}/mod_bucketeer.so
+%attr(755,root,root) %{_libexecdir}/mod_bucketeer.so
+%endif
 
 %files mod_cache
 %defattr(644,root,root,755)
@@ -2122,6 +2138,13 @@
 %attr(755,root,root) %{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*
 
+%files dbmtools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/dbmmanage
+%attr(755,root,root) %{_sbindir}/htdbm
+%{_mandir}/man1/dbmmanage.1*
+%{_mandir}/man1/htdbm.1*
+
 %files cgi_test
 %defattr(644,root,root,755)
 %dir %{_cgibindir}
@@ -2134,6 +2157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.429  2005/12/14 11:28:47  arekm
+- bucketter bcond; dmbtools package; ldap fix
+
 Revision 1.428  2005/12/14 11:08:43  glen
 - sorted module %packages
 
================================================================

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