X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=30b2cf494e71ec1be4e18409519a30d26508a426;hb=f949158b2c667b6c300d30e8a059c2995e3be187;hp=97a7920438e9cf50b0ee0eeef4d4156e992e65fd;hpb=57f4bd5e2aa6f9c0c2edcc2210c5311ecf9f839b;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 97a7920..30b2cf4 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,25 +1,9 @@
-# TODO:
-# - config examples for mod_*
-# - --with-suexec-gidmin=500 or =100 ?
-# - --with-suexec-uidmin=500 or =1000 ?
-# - subpackages for MPMs
-# - !!!check if all modules (*.so) are exactly the same for different MPMs
-# - check those autn modules inner deps
-# - for external packages: don't use any apache module name in dep as they
-#   differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default is chosen?
-# - 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
 %bcond_without	ldap		# build without LDAP support
-%bcond_without	metuxmpm	# metux MPM
 %bcond_without	peruser		# peruser MPM
 %bcond_without	event		# event MPM
-%bcond_with     distcache	# distcache support
+%bcond_with	distcache	# distcache support
 %bcond_with	bucketeer	# debug one
 #
 %include	/usr/lib/rpm/macros.perl
@@ -34,17 +18,17 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.2.6
+Version:	2.2.13
 Release:	2
-License:	Apache Group License
-Group:		Networking/Daemons
+License:	Apache v2.0
+Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	d050a49bd7532ec21c6bb593b3473a5d
+# Source0-md5:	2803e35be6650f5b739e6e91faa824dd
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
-Source3:	%{name}-icons.tar.gz
-# Source3-md5:	2b085cbc19fd28536dc883f0b864cd83
-Source4:	%{name}.sysconfig
+Source3:	%{name}.sysconfig
+Source4:	%{name}-server.crt
+Source5:	%{name}-server.key
 Source6:	%{name}-httpd.conf
 Source7:	%{name}-common.conf
 Source8:	%{name}-mod_vhost_alias.conf
@@ -59,44 +43,37 @@ Source16:	%{name}-mod_deflate.conf
 Source17:	%{name}-mod_autoindex.conf
 Source18:	%{name}-multilang-errordoc.conf
 Source19:	%{name}-manual.conf
-Source20:	%{name}-server.crt
-Source21:	%{name}-server.key
-Source22:	%{name}-mod_userdir.conf
-Source23:	%{name}-mpm.conf
-Source24:	%{name}-languages.conf
-Source25:	%{name}-mod_mime.conf
-Source27:	%{name}-mod_authz_host.conf
-Source28:	%{name}-mod_cgid.conf
-Source29:	%{name}-mod_log_config.conf
-Source30:	%{name}-mod_mime_magic.conf
-Source31:	%{name}-mod_cache.conf
+Source20:	%{name}-mod_userdir.conf
+Source21:	%{name}-mpm.conf
+Source22:	%{name}-languages.conf
+Source23:	%{name}-mod_mime.conf
+Source24:	%{name}-mod_authz_host.conf
+Source25:	%{name}-mod_cgid.conf
+Source26:	%{name}-mod_log_config.conf
+Source27:	%{name}-mod_mime_magic.conf
+Source28:	%{name}-mod_cache.conf
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-apr.patch
-# project homepage http://www.metux.de/mpm/en/?patpage=index
-# http://www.sannes.org/metuxmpm/
-Patch5:		httpd-2.0.48-metuxmpm-r8.patch
 # what about this? it isn't applied...
 Patch6:		httpd-2.0.40-xfsz.patch
 Patch7:		%{name}-syslibs.patch
 Patch8:		httpd-2.0.45-encode.patch
 Patch9:		%{name}-paths.patch
 Patch10:	httpd-2.0.46-dav401dest.patch
+Patch11:	%{name}-bug-40970.patch
 Patch12:	httpd-2.0.46-sslmutex.patch
 Patch14:	httpd-2.0.48-corelimit.patch
 Patch15:	httpd-2.0.48-debuglog.patch
 Patch18:	%{name}-v6only-ENOPROTOOPT.patch
 Patch19:	%{name}-conffile-path.patch
 Patch20:	%{name}-apxs.patch
-# http://www.telana.com/peruser.php
-Patch21:	httpd-2.0.52-peruser-0.1.6.patch
-Patch22:	%{name}-libtool.patch
-Patch23:	%{name}-revert-bug-40463.patch
+Patch23:	%{name}-suexec_fcgi.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= 1:1.2
-BuildRequires:	apr-util-devel >= 1:1.2
+BuildRequires:	apr-util-devel >= 1:1.3
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	db-devel
@@ -104,7 +81,7 @@ BuildRequires:	db-devel
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	libtool >= 2:1.5
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_ssl:BuildRequires:	openssl-tools >= 0.9.7d}
 BuildRequires:	pcre-devel
@@ -113,12 +90,9 @@ BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-# packages that were in apache-2.0.rpm, for compatibility
 Requires:	%{name}-errordocs = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
-Requires:	%{name}-mod_asis = %{version}-%{release}
 Requires:	%{name}-mod_auth = %{version}-%{release}
-Requires:	%{name}-mod_cern_meta = %{version}-%{release}
 Requires:	%{name}-mod_cgi = %{version}-%{release}
 Requires:	%{name}-mod_env = %{version}-%{release}
 Requires:	%{name}-mod_include = %{version}-%{release}
@@ -183,7 +157,7 @@ sunucusudur.
 %package base
 Summary:	The Number One HTTP Server On The Internet
 Summary(pl.UTF-8):	Wiodący w Internecie serwer HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -192,13 +166,10 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	/etc/mime.types
 Requires:	/sbin/chkconfig
 Requires:	apr >= 1:1.2
-Requires:	mailcap
 Requires:	psmisc >= 20.1
-Requires:	rc-scripts >= 0.4.0.15
-Requires:	webapps
+Requires:	rc-scripts >= 0.4.1.23
 Provides:	apache(modules-api) = %{_apache_modules_api}
 Provides:	group(http)
 Provides:	user(http)
@@ -228,7 +199,7 @@ serwerem WWW w Internecie.
 %package suexec
 Summary:	Apache suexec wrapper
 Summary(pl.UTF-8):	Wrapper suexec do serwera WWW Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/suexec.html
 Requires:	%{name}-base = %{version}-%{release}
 
@@ -300,18 +271,6 @@ Multi-language error messages.
 %description errordocs -l pl.UTF-8
 Dokumenty opisujące błędy HTTP dla Apache'a w wielu językach.
 
-%package apxs
-Summary:	APache eXtenSion tool
-Summary(pl.UTF-8):	Narzędzie do rozszerzania Apache'a
-Group:		Development/Tools
-Requires:	apr-devel
-
-%description apxs
-APache eXtenSion tool.
-
-%description apxs -l pl.UTF-8
-Narzędzie do rozszerzania Apache'a.
-
 %package devel
 Summary:	Module development tools for the Apache web server
 Summary(es.UTF-8):	Archivos de inclusión del Apache para desarrollo de módulos
@@ -320,9 +279,9 @@ Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia modułów rozszerzeń do serw
 Summary(pt_BR.UTF-8):	Arquivos de inclusão do Apache para desenvolvimento de módulos
 Summary(ru.UTF-8):	Средства разработки модулей для веб-сервера Apache
 Group:		Networking/Utilities
-Requires:	%{name}-apxs = %{version}-%{release}
 Requires:	apr-util-devel >= 1:1.2
 Requires:	libtool
+Obsoletes:	apache-apxs
 Obsoletes:	apache-static
 
 %description devel
@@ -355,7 +314,7 @@ desenvolver módulos adicionais para o Apache.
 %package mod_actions
 Summary:	Apache module for executing CGI scripts based on media type or request method
 Summary(pl.UTF-8):	Moduł Apache'a do uruchamiania skryptów CGI w oparciu o rodzaj danych lub żądania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_actions.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_actions) = %{version}-%{release}
@@ -377,7 +336,7 @@ pliki.
 %package mod_alias
 Summary:	Mapping different parts of the host filesystem in the document tree and for URL redirection
 Summary(pl.UTF-8):	Odwzorowywanie różnych części systemu plików w drzewie dokumentów i przekierowywanie URL-i
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_alias) = %{version}-%{release}
@@ -420,7 +379,7 @@ URL-ach. Bardziej skomplikowane zadania, takie jak modyfikowanie
 %package mod_asis
 Summary:	Sends files that contain their own HTTP headers
 Summary(pl.UTF-8):	Wysyłanie plików zawierających własne nagłówki HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_asis.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_asis) = %{version}-%{release}
@@ -446,9 +405,9 @@ włącznie z przekierowaniami i innymi specjalnymi odpowiedziami HTTP
 bez wymagania skryptu CGI lub nph.
 
 %package mod_auth
-Summary:	Virtual package which which provides backward compatibility with apache 2.0
+Summary:	Virtual package which provides backward compatibility with apache 2.0
 Summary(pl.UTF-8):	Pakiet wirtualny zapewniający kompatybilność wsteczną z apache 2.0
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_auth_basic = %{version}-%{release}
 Requires:	%{name}-mod_authn_file = %{version}-%{release}
@@ -470,7 +429,7 @@ wstecznej z apache 2.0.
 %package mod_auth_basic
 Summary:	Apache module that allows Basic authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający korzystawnie z uwierzytelnienia Basic
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_auth_basic) = %{version}-%{release}
@@ -489,9 +448,9 @@ Ten moduł pozwala używać uwierzytelnienia HTTP Basic do ograniczania
 dostępu poprzez wyszukiwanie użytkowników we wskazanych miejscach
 
 %package mod_auth_dbm
-Summary:	Virtual package which which provides backward compatibility with apache 2.0
+Summary:	Virtual package which provides backward compatibility with apache 2.0
 Summary(pl.UTF-8):	Pakiet wirtualny zapewniający kompatybilność wsteczną z apache 2.0
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-dbmtools = %{version}-%{release}
 Requires:	%{name}-mod_authn_dbm = %{version}-%{release}
@@ -509,7 +468,7 @@ apache-mod_authz_dbm dla kompatybilności wstecznej z apache 2.0.
 %package mod_auth_digest
 Summary:	User authentication using MD5 Digest Authentication
 Summary(pl.UTF-8):	Uwierzytelnianie użytkowników przy użyciu MD5 Digest
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_auth_digest) = %{version}-%{release}
@@ -526,7 +485,7 @@ eksperymentalny.
 %package mod_authn_alias
 Summary:	Apache module that provides the ability to create extended authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający tworzenie rozszerzonego uwierzytelniania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_alias) = %{version}-%{release}
@@ -542,7 +501,7 @@ w pliku konfiguracyjnym i nadawanie im aliasów.
 %package mod_authn_anon
 Summary:	Apache module that allows "anonymous" user access to authenticated areas
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający dostęp anonimowych użytkowników do stref uwierzytelnianych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_anon.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_anon) = %{version}-%{release}
@@ -567,7 +526,7 @@ być logowane.
 %package mod_authn_dbd
 Summary:	Apache module that allows user authentication using an SQL
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu tabel SQL
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_dbd.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_dbd = %{version}-%{release}
@@ -586,7 +545,7 @@ wyszukiwanie w tabelach SQL.
 %package mod_authn_dbm
 Summary:	Apache module that allows user authentication using DBM files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu plików DBM
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_dbm.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_dbm) = %{version}-%{release}
@@ -604,7 +563,7 @@ wyszukiwanie w tabelach haseł DBM.
 %package mod_authn_default
 Summary:	Apache module that rejects any credentials supplied by the user
 Summary(pl.UTF-8):	Moduł Apache'a odrzucający wszystkie dane podane przez użytkownika
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_default.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_default) = %{version}-%{release}
@@ -623,7 +582,7 @@ przez użytkownika.
 %package mod_authn_file
 Summary:	Apache module that allows user authentication using text files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników poprzez pliki tekstowe
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_file.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_file) = %{version}-%{release}
@@ -641,10 +600,11 @@ wyszukiwanie w plikach tekstowych z hasłami.
 %package mod_authnz_ldap
 Summary:	Apache module that allows an LDAP directory to be used to store the database for HTTP Basic authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający przechowywanie danych dla uwierzytelnienia HTTP Basic w bazie LDAP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 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:	apr-util-ldap
 Provides:	apache(mod_authnz_ldap) = %{version}-%{release}
 # compat
 Provides:	apache(mod_auth_ldap) = %{version}-%{release}
@@ -662,7 +622,7 @@ mod_auth_basic uwierzytelnianie użytkowników poprzez katalog LDAP.
 %package mod_authz_dbm
 Summary:	Apache module that allows group authorization using DBM files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie grup z użyciem plików DBM
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_dbm.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_dbm) = %{version}-%{release}
@@ -680,7 +640,7 @@ do grupy zapisywanej w pliku DBM.
 %package mod_authz_default
 Summary:	Apache module that rejects any authorization request
 Summary(pl.UTF-8):	Moduł Apache'a odrzucający wszystkie żądania autoryzacji
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_default.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_default) = %{version}-%{release}
@@ -699,7 +659,7 @@ autoryzacji.
 %package mod_authz_groupfile
 Summary:	Apache module that allows group authorization using plaintext files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację grup przy użyciu plików tekstowych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_groupfile.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_groupfile) = %{version}-%{release}
@@ -717,7 +677,7 @@ do grupy zapisywanej w pliku tekstowym.
 %package mod_authz_host
 Summary:	Apache module that allows group authorizations based on host (name or IP address)
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację grup w oparcu o host (nazwę lub IP)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_host) = %{version}-%{release}
@@ -742,7 +702,7 @@ charakterystyki żądania klienta dostępnej w zmiennych środowiskowych.
 %package mod_authz_owner
 Summary:	Apache module that allows authorization based on file ownership
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzacje w oparciu o własność plików
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_authz_owner.html
 Requires:	%{name}-base = %{version}-%{release}
 #Requires:	any-auth-module
@@ -766,7 +726,7 @@ mod_auth_digest.
 %package mod_authz_user
 Summary:	Apache module that allows user authorization
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację użytkowników
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_authz_user.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_user) = %{version}-%{release}
@@ -782,7 +742,7 @@ WWW dla uwierzytelnionych użytkowników.
 %package mod_autoindex
 Summary:	Apache module - display index of files
 Summary(pl.UTF-8):	Moduł apache do wyświetlania indeksu plików
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_autoindex.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
@@ -798,7 +758,7 @@ Ten pakiet dostarcza moduł autoindex, który generuje indeks plików.
 %package mod_bucketeer
 Summary:	buckets manipulation filter
 Summary(pl.UTF-8):	Dzielenie kubełków po znalezieniu znaku sterującego
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_bucketeer) = %{version}-%{release}
 
@@ -811,7 +771,7 @@ Dzielenie kubełków po znalezieniu znaku sterującego.
 %package mod_cache
 Summary:	Content cache keyed to URIs
 Summary(pl.UTF-8):	Pamięć podręczna wg klucza URI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cache.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_cache) = %{version}-%{release}
@@ -833,7 +793,7 @@ dysku (używane do cache'owania proxy).
 
 %package mod_case_filter
 Summary:	TODO
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_case_filter) = %{version}-%{release}
 
@@ -841,7 +801,7 @@ Provides:	apache(mod_case_filter) = %{version}-%{release}
 
 %package mod_case_filter_in
 Summary:	TODO
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_case_filter_in) = %{version}-%{release}
 
@@ -850,7 +810,7 @@ Provides:	apache(mod_case_filter_in) = %{version}-%{release}
 %package mod_cern_meta
 Summary:	CERN httpd metafile semantics
 Summary(pl.UTF-8):	Obsługa semantyki metaplików CERN httpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cern_meta.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_cern_meta) = %{version}-%{release}
@@ -876,10 +836,11 @@ użytkowników CERN wykorzystujących ten moduł.
 %package mod_cgi
 Summary:	Execution of CGI scripts
 Summary(pl.UTF-8):	Uruchamianie skryptów CGI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cgi.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
+Suggests:	%{name}-suexec = %{version}-%{release}
 Provides:	apache(mod_cgi) = %{version}-%{release}
 Provides:	webserver(cgi)
 
@@ -910,7 +871,7 @@ zachowują się identycznie.
 %package mod_cgid
 Summary:	Execution of CGI scripts using an external CGI daemon
 Summary(pl.UTF-8):	Uruchamianie zewnętrznych skryptów CGI za pomocą daemona CGI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cgid.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
@@ -938,7 +899,7 @@ wielowątkowy MPM.
 %package mod_charset_lite
 Summary:	Specify character set translation or recoding
 Summary(pl.UTF-8):	Translacja lub przekodowywanie znaków
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_charset_lite.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_charset_lite) = %{version}-%{release}
@@ -962,7 +923,7 @@ Jest to moduł eksperymentalny i należy używać go z uwagą.
 %package mod_dav
 Summary:	Apache module - Distributed Authoring and Versioning
 Summary(pl.UTF-8):	Moduł Apache'a - rozproszone autorstwo i wersjonowanie
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_dav.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	apache-mod_authn_file
@@ -984,7 +945,7 @@ zdalnym serwerze WWW.
 %package mod_dbd
 Summary:	Manages SQL database connections
 Summary(pl.UTF-8):	Zarządzanie połączeniami z bazą danych SQL
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_dbd.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dbd) = %{version}-%{release}
@@ -1005,7 +966,7 @@ niewątkowych MPM.
 %package mod_deflate
 Summary:	Apache module: Compress content before it is delivered to the client
 Summary(pl.UTF-8):	Moduł Apache'a kompresujący dane przed przesłaniem ich do klienta
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_deflate.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_headers = %{version}-%{release}
@@ -1020,7 +981,7 @@ Moduł kompresujący dane przed przesłaniem ich do klienta.
 %package mod_dir
 Summary:	Apache module for "trailing slash" redirects and serving directory index files
 Summary(pl.UTF-8):	Moduł Apache'a oferujący przekierowania i udostępnianie informacji o zawartości katalogu
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_dir.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dir) = %{version}-%{release}
@@ -1037,7 +998,7 @@ katalogu.
 %package mod_dumpio
 Summary:	Dumps all I/O to error log as desired
 Summary(pl.UTF-8):	Zrzucanie całości wejścia/wyjścia do logu błędów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_dumpio.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dumpio) = %{version}-%{release}
@@ -1065,7 +1026,7 @@ przy diagnostyce problemów.
 %package mod_echo
 Summary:	A simple echo server to illustrate protocol modules
 Summary(pl.UTF-8):	Prosty serwer ocho ilustrujący moduły protokołów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_echo.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_echo) = %{version}-%{release}
@@ -1083,10 +1044,11 @@ napisać cokolwiek, a on odpowie tym samym.
 %package mod_env
 Summary:	Modifies the environment which is passed to CGI scripts and SSI pages
 Summary(pl.UTF-8):	Modyfikowanie środowiska przekazywanego skryptom CGI i stronom SSI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_env.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_env) = %{version}-%{release}
+Provides:	webserver(setenv)
 
 %description mod_env
 This module allows for control of the environment that will be
@@ -1104,10 +1066,11 @@ usuwane w procesie konfiguracji.
 %package mod_expires
 Summary:	Apache module which generates Expires HTTP headers
 Summary(pl.UTF-8):	Moduł Apache'a generujący nagłówki HTTP Expires
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_expires.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_expires) = %{version}-%{release}
+Provides:	webserver(expires)
 
 %description mod_expires
 This module controls the setting of the Expires HTTP header in server
@@ -1123,7 +1086,7 @@ ważności może być ustalana w zależności od czasu modyfikacji plików
 %package mod_ext_filter
 Summary:	Pass the response body through an external program before delivery to the client
 Summary(pl.UTF-8):	Przekazywanie ciała odpowiedzi do zewnętrznego programu przed przekazaniem klientowi
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ext_filter) = %{version}-%{release}
@@ -1170,7 +1133,7 @@ dla filtrów.
 %package mod_file_cache
 Summary:	Apache module: caches a static list of files in memory
 Summary(pl.UTF-8):	Moduł Apache'a cache'ujący statyczną listę plików w pamięci
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_file_cache.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_file_cache) = %{version}-%{release}
@@ -1188,7 +1151,7 @@ Moduł cache'ujący statyczną listę plików w pamięci.
 %package mod_filter
 Summary:	Context-sensitive smart filter configuration module
 Summary(pl.UTF-8):	Moduł inteligentnej, zależnej od kontekstu konfiguracji filtrów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_filter.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_filter) = %{version}-%{release}
@@ -1208,7 +1171,7 @@ jeśli content-type nie jest znany z góry (np. w wypadku proxy).
 %package mod_headers
 Summary:	Apache module allows for the customization of HTTP response headers
 Summary(pl.UTF-8):	Moduł Apache'a pozwalający na modyfikację nagłówków HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_headers.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_headers) = %{version}-%{release}
@@ -1225,7 +1188,7 @@ wysyłanych do przeglądarki.
 %package mod_ident
 Summary:	RFC 1413 ident lookups
 Summary(pl.UTF-8):	Sprawdzanie identyfikacji RFC 1413
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ident.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ident) = %{version}-%{release}
@@ -1241,7 +1204,7 @@ sprawdzenia właściciela połączenia.
 %package mod_imagemap
 Summary:	Server-side imagemap processing
 Summary(pl.UTF-8):	Przetwarzanie map obrazów po stronie serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_imagemap.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_imagemap) = %{version}-%{release}
@@ -1263,7 +1226,7 @@ SetHandler) będzie przetwarzany przez ten moduł.
 %package mod_include
 Summary:	Server-parsed html documents (Server Side Includes)
 Summary(pl.UTF-8):	Dokumenty przetwarzane przez serwer (Server Side Includes)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_include.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_include) = %{version}-%{release}
@@ -1285,7 +1248,7 @@ a także ustawianie i wypisywanie zmiennych środowiskowych.
 %package mod_info
 Summary:	Apache module with comprehensive overview of the server configuration
 Summary(pl.UTF-8):	Moduł Apache'a udostępniający informacje o serwerze
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_info.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1301,23 +1264,29 @@ Moduł udostępniający informacje o konfiguracji serwera,
 zainstalowanych modułach itp.
 
 %package mod_ldap
-Summary:	Apache module to use LDAP connections
-Summary(pl.UTF-8):	Moduł Apache'a umożliwiający korzystanie z połączeń LDAP
-Group:		Networking/Daemons
+Summary:	Apache module for LDAP connection pooling and result caching services for other LDAP modules
+Summary(pl.UTF-8):	Moduł Apache'a zarządzający połączeniami z serwerami LDAP
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ldap) = %{version}-%{release}
 
 %description mod_ldap
-Apache module to use LDAP connections.
+This module was created to improve the performance of websites relying
+on backend connections to LDAP servers. In addition to the functions
+provided by the standard LDAP libraries, this module adds an LDAP
+connection pool and an LDAP shared memory cache.
 
 %description mod_ldap -l pl.UTF-8
-Moduł Apache'a umożliwiający korzystanie z połączeń LDAP.
+Moduł Apache'a poprawiający wydajność serwisów polegających na
+połączeniach z serwerami LDAP. Oprócz funkcjo udostępnianych przez
+standardowe biblioteki LDAP ten moduł dodaje zarządzanie pulą połączeń
+i współdzieloną pamięć podręczną zapytań.
 
 %package mod_log_config
 Summary:	Logging of the requests made to the server
 Summary(pl.UTF-8):	Logowanie żądań zgłaszanych do serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_log_config.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_log_config) = %{version}-%{release}
@@ -1341,7 +1310,7 @@ charakterystyki żądania.
 %package mod_log_forensic
 Summary:	Forensic Logging of the requests made to the server
 Summary(pl.UTF-8):	Logowanie żadań zgłaszanych do serwera w celu późniejszej analizy
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_log_forensic.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_log_forensic) = %{version}-%{release}
@@ -1359,7 +1328,7 @@ zawiera dwie linie dla każdego żądania.
 %package mod_logio
 Summary:	Logging of input and output bytes per request
 Summary(pl.UTF-8):	Logowanie liczby bajtów wejścia i wyjścia dla zapytań
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_logio.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_log_config = %{version}-%{release}
@@ -1384,9 +1353,10 @@ odzwierciedlały wszystkie zmiany dokonywane przez szyfrowanie.
 %package mod_mime
 Summary:	Associates the requested filename's extensions with the file's behavior and content
 Summary(pl.UTF-8):	Wiązanie określonych rozszerzeń plików z zachowaniem i zawartością
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_mime.html
 Requires:	%{name}-base = %{version}-%{release}
+Requires:	mailcap
 Provides:	apache(mod_mime) = %{version}-%{release}
 
 %description mod_mime
@@ -1410,7 +1380,7 @@ informacji o negocjacji treści jest w dokumentacji do mod_negotiation.
 %package mod_mime_magic
 Summary:	Determines the MIME type of a file by looking at a few bytes of its contents
 Summary(pl.UTF-8):	Określanie typu MIME pliku poprzez sprawdzanie kilku bajtów jego zawartości
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_mime_magic.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	file
@@ -1431,7 +1401,7 @@ rozwiązać mod_mime.
 %package mod_negotiation
 Summary:	Provides for content negotiation
 Summary(pl.UTF-8):	Moduł do negocjacji treści
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_negotiation.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
@@ -1450,7 +1420,7 @@ kilku możliwych dokumentów.
 %package mod_proxy
 Summary:	Apache module with Web proxy
 Summary(pl.UTF-8):	Moduł Apache'a dodający obsługę serwera proxy
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_proxy.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1470,10 +1440,11 @@ HTTP/1.0 i HTTP/1.1.
 %package mod_rewrite
 Summary:	Apache module with rule-based engine for rewrite requested URLs on the fly
 Summary(pl.UTF-8):	Moduł Apache'a do "przepisywania" adresów URL w locie
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_rewrite) = %{version}-%{release}
+Provides:	webserver(rewrite)
 
 %description mod_rewrite
 This package contains It provides a rule-based rewriting engine to
@@ -1485,7 +1456,7 @@ Moduł oferujący możliwość "przepisywania" adresów URL w locie.
 %package mod_setenvif
 Summary:	Allows the setting of environment variables based on characteristics of the request
 Summary(pl.UTF-8):	Ustawianie zmiennych środowiskowych w oparciu o charakterystykę żądania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_setenvif.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_setenvif) = %{version}-%{release}
@@ -1505,7 +1476,7 @@ części serwera do podejmowania decyzji o podejmowanych akcjach.
 %package mod_speling
 Summary:	Attempts to correct mistaken URLs by ignoring capitalization and by allowing up to one misspelling
 Summary(pl.UTF-8):	Próba poprawiania błędnych URL-i poprzez ignorowanie wielkości liter i zezwalanie na jedną literówkę
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_speling.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_speling) = %{version}-%{release}
@@ -1537,7 +1508,7 @@ Summary:	SSL/TLS module for the Apache HTTP server
 Summary(pl.UTF-8):	Moduł SSL/TSL dla serwera Apache
 Summary(ru.UTF-8):	Модуль SSL/TLS для веб-сервера Apache
 Epoch:		1
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ssl) = 1:%{version}-%{release}
@@ -1559,7 +1530,7 @@ Security).
 %package mod_status
 Summary:	Server status report module for Apache
 Summary(pl.UTF-8):	Moduł udostępniający informacje statystyczne z serwera Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_status.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1576,10 +1547,26 @@ browser).
 Moduł pozwala administratorowi na przeglądanie statystyk dotyczących
 pracy serwera Apache (w postaci strony HTML).
 
+%package mod_substitute
+Summary:	Substitute module for Apache
+Summary(pl.UTF-8):	Moduł pozwalający na znajdywanie i zastępowanie wyjścia dla serwera Apache
+Group:		Networking/Daemons/HTTP
+URL:		http://httpd.apache.org/docs/2.2/mod/mod_substitute.html
+Requires:	%{name}-base = %{version}-%{release}
+Provides:	apache(mod_substitute) = %{version}-%{release}
+
+%description mod_substitute
+The Substitute module provides a mechanism to perform both regular
+expression and fixed string substitutions on response bodies.
+
+%description mod_substitute -l pl.UTF-8
+Moduł pozwala na zastępowanie ciągów znaków w wyjściu również na
+podstawie wyrażenia regularnego.
+
 %package mod_unique_id
 Summary:	Apache module which provides a magic token for each request
 Summary(pl.UTF-8):	Moduł Apache'a nadający każdemu zapytaniu unikalny token
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_unique_id.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_unique_id) = %{version}-%{release}
@@ -1602,7 +1589,7 @@ UNIQUE_ID.
 %package mod_userdir
 Summary:	User-specific directories
 Summary(pl.UTF-8):	Katalogi specyficzne dla użytkowników
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_userdir.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1619,7 +1606,7 @@ użytkowników przy użyciu składni http://example.com/~user/ .
 %package mod_usertrack
 Summary:	Apache module for user tracking using cookies
 Summary(pl.UTF-8):	Moduł Apache'a służący do śledzenia "ciasteczek"
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_usertrack.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_usertrack) = %{version}-%{release}
@@ -1636,7 +1623,7 @@ przy użyciu katalogu CookieLog. Pozwala na użycie wielu plików logów.
 %package mod_version
 Summary:	Version dependent configuration
 Summary(pl.UTF-8):	Konfiguracja zależna od wersji
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_version.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_version) = %{version}-%{release}
@@ -1658,7 +1645,7 @@ wyrażeniami regularnymi.
 %package mod_vhost_alias
 Summary:	Apache module for dynamically configured mass virtual hosting
 Summary(pl.UTF-8):	Moduł Apache'a dodający obsługę hostów wirtualnych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_vhost_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_vhost_alias) = %{version}-%{release}
@@ -1708,7 +1695,7 @@ Summary:	cgi test/demo programs
 Summary(pl.UTF-8):	Programy testowe/przykładowe cgi
 Group:		Networking/Utilities
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	filesystem >= 3.0-11
+Requires:	filesystem >= 2.0-1
 
 %description cgi_test
 Two cgi test/demo programs: test-cgi and print-env.
@@ -1723,19 +1710,17 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
 %patch23 -p1
 
 # using system apr, apr-util and pcre
@@ -1753,7 +1738,8 @@ sed -i -e 's,/lib$,/%{_lib},' config.layout
 
 %build
 cp /usr/share/apr/build/apr_common.m4 build
-cp /usr/share/libtool/ltmain.sh build
+%{__libtoolize}
+%{__aclocal} -I build
 cp /usr/share/automake/config.* build
 %{__autoheader}
 %{__autoconf}
@@ -1769,7 +1755,7 @@ touch ssl_expr_scan.c
 cd ../..
 
 CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
-for mpm in prefork worker %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} %{?with_event:event}; do
+for mpm in prefork worker %{?with_event:event}; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
 	--enable-layout=PLD \
@@ -1853,7 +1839,7 @@ cd ..
 
 done
 
-for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event}; do
 	if ! cmp -s buildmpm-prefork/modules-inside buildmpm-${mpm}/modules-inside; then
 		echo "List of compiled modules is different between prefork-MPM and ${mpm}-MPM!"
 		echo "Build failed."
@@ -1873,7 +1859,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # install other mpm-s
-for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event}; do
 	install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
 done
 
@@ -1885,14 +1871,14 @@ ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
 %if %{with ssl}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssl
-install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
-install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
 %endif
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -1901,12 +1887,12 @@ CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/"
 
 install %{SOURCE7} $CFG/10_common.conf
 
-install %{SOURCE25} $CFG/01_mod_mime.conf
-install %{SOURCE27} $CFG/01_mod_authz_host.conf
-install %{SOURCE28} $CFG/01_mod_cgid.conf
-install %{SOURCE29} $CFG/01_mod_log_config.conf
-install %{SOURCE30} $CFG/01_mod_mime_magic.conf
-install %{SOURCE31} $CFG/01_mod_cache.conf
+install %{SOURCE23} $CFG/01_mod_mime.conf
+install %{SOURCE24} $CFG/01_mod_authz_host.conf
+install %{SOURCE25} $CFG/01_mod_cgid.conf
+install %{SOURCE26} $CFG/01_mod_log_config.conf
+install %{SOURCE27} $CFG/01_mod_mime_magic.conf
+install %{SOURCE28} $CFG/01_mod_cache.conf
 install %{SOURCE8} $CFG/20_mod_vhost_alias.conf
 install %{SOURCE9} $CFG/25_mod_status.conf
 install %{SOURCE10} $CFG/30_mod_proxy.conf
@@ -1919,9 +1905,9 @@ install %{SOURCE16} $CFG/58_mod_deflate.conf
 install %{SOURCE17} $CFG/57_mod_autoindex.conf
 install %{SOURCE18} $CFG/30_errordocs.conf
 install %{SOURCE19} $CFG/30_manual.conf
-install %{SOURCE22} $CFG/16_mod_userdir.conf
-install %{SOURCE23} $CFG/10_mpm.conf
-install %{SOURCE24} $CFG/20_languages.conf
+install %{SOURCE20} $CFG/16_mod_userdir.conf
+install %{SOURCE21} $CFG/10_mpm.conf
+install %{SOURCE22} $CFG/20_languages.conf
 
 echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
 echo "LoadModule authn_file_module	modules/mod_authn_file.so" > $CFG/00_mod_authn_file.conf
@@ -1970,6 +1956,7 @@ echo "LoadModule headers_module	modules/mod_headers.so" > $CFG/00_mod_headers.co
 echo "LoadModule rewrite_module	modules/mod_rewrite.so" > $CFG/00_mod_rewrite.conf
 echo "LoadModule usertrack_module	modules/mod_usertrack.so" > $CFG/00_mod_usertrack.conf
 echo "LoadModule unique_id_module	modules/mod_unique_id.so" > $CFG/00_mod_unique_id.conf
+echo "LoadModule substitute_module	modules/mod_substitute.so" > $CFG/00_mod_substitute.conf
 
 # anything in style dir not ending with .css is trash
 rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
@@ -1991,13 +1978,18 @@ mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 
 # cgi_test: create config file with ScriptAlias
-cat << EOF > $CFG/09_cgi_test.conf
+cat << 'EOF' > $CFG/09_cgi_test.conf
 ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
 
+# our suexec is patched to support php + fcgi + suexec with
+# virtual users when called as suexec.fcgi
+ln -sf suexec $RPM_BUILD_ROOT%{_sbindir}/suexec.fcgi
+
 # no value
 rm $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.exp
 rm $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.prefork.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/{extra,original}
@@ -2047,7 +2039,7 @@ if [ "$1" = "0" ]; then
 	%groupremove http
 fi
 
-%triggerpostun base -- %{name} <= 2.0.50-6
+%triggerpostun base -- %{name} < 2.0.50-6.9
 %banner %{name}-2.0.50-6 << EOF
 WARNING!!!
 Since apache-2.0.50-6 autoindex module has been separated to package
@@ -2129,7 +2121,7 @@ fi
 NB! Apache main config has been changed to /etc/httpd/apache.conf
 
 There has been changed a lot, so many things could be broken.
-Please report bugs to http://bugs.pld-linux.org/.
+Please report bugs to <http://bugs.pld-linux.org/>.
 
 EOF
 
@@ -2233,6 +2225,7 @@ fi
 %module_scripts mod_speling
 %module_scripts mod_ssl
 %module_scripts mod_status
+%module_scripts mod_substitute
 %module_scripts mod_unique_id
 %module_scripts mod_userdir
 %module_scripts mod_usertrack
@@ -2267,9 +2260,7 @@ fi
 %defattr(644,root,root,755)
 %doc ABOUT_APACHE CHANGES README
 %doc docs/conf/mime.types
-
 %attr(754,root,root) /etc/rc.d/init.d/httpd
-
 %attr(751,root,root) %dir %{_sysconfdir}
 %{_sysconfdir}/modules
 %{_sysconfdir}/run
@@ -2317,6 +2308,7 @@ fi
 %files suexec
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_sbindir}/suexec
+%attr(755,root,root) %{_sbindir}/suexec.fcgi
 %attr(755,root,root) %{_libexecdir}/mod_suexec.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_suexec.conf
 %{_mandir}/man8/suexec.8*
@@ -2324,18 +2316,6 @@ fi
 %files index
 %defattr(644,root,root,755)
 %config(noreplace,missingok) %{_datadir}/html/index.html*
-%{_datadir}/html/*.gif
-%{_datadir}/html/*.png
-
-%files apxs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/apxs
-%attr(755,root,root) %{_sbindir}/envvars*
-# package libexecdir also to -apxs, as -apxs and -devel don't require -base package
-%dir %{_libexecdir}
-%dir %{_libexecdir}/build
-%{_libexecdir}/build/config_vars.mk
-%{_mandir}/man8/apxs.8*
 
 %files tools
 %defattr(644,root,root,755)
@@ -2352,11 +2332,15 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}
-# FIXME: httpd.exp needed only on AIX
-%{_libexecdir}/*.exp
+%attr(755,root,root) %{_sbindir}/apxs
+%attr(755,root,root) %{_sbindir}/envvars*
+%dir %{_libexecdir}
+%dir %{_libexecdir}/build
 %{_libexecdir}/build/[lprs]*.mk
+%{_libexecdir}/build/config_vars.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
+%{_includedir}
+%{_mandir}/man8/apxs.8*
 
 %files mod_actions
 %defattr(644,root,root,755)
@@ -2661,6 +2645,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_status.conf
 %attr(755,root,root) %{_libexecdir}/mod_status.so
 
+%files mod_substitute
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_substitute.conf
+%attr(755,root,root) %{_libexecdir}/mod_substitute.so
+
 %files mod_unique_id
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_unique_id.conf