- use HUP for flush-logs

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index ff8e825f2e6a424f505d9e73fea9eaf0f588867c..b54dc4ecb32cc6fad2de6ecd84ba0f95dac3b606 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,12 +34,12 @@ 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.4
+Version:       2.2.6
 Release:       4
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 3add41e0b924d4bb53c2dee55a38c09e
+# Source0-md5: d050a49bd7532ec21c6bb593b3473a5d
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}-icons.tar.gz
@@ -104,7 +104,7 @@ BuildRequires:      db-devel
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel >= 1.8.3
 BuildRequires: libtool >= 2:1.5
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 %{?with_ssl:BuildRequires:     openssl-tools >= 0.9.7d}
 BuildRequires: pcre-devel
@@ -211,6 +211,7 @@ Obsoletes:  apache-mod_optional_fn_import
 Obsoletes:     apache-mod_optional_fn_import
 Obsoletes:     apache-mod_optional_hook_import
 Conflicts:     apache < 2.2.0
+Conflicts:     logrotate < 3.7-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
 Conflicts:     rpm < 4.4.2-0.2
 
@@ -299,18 +300,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
@@ -319,7 +308,7 @@ 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}
+Obsoletes:     %{name}-apxs
 Requires:      apr-util-devel >= 1:1.2
 Requires:      libtool
 Obsoletes:     apache-static
@@ -1320,6 +1309,7 @@ Group:            Networking/Daemons
 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}
+Provides:      webserver(log)
 
 %description mod_log_config
 This module provides for flexible logging of client requests. Logs are
@@ -1989,13 +1979,14 @@ 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
 
 # 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}
@@ -2127,7 +2118,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
 
@@ -2265,9 +2256,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
@@ -2325,16 +2314,6 @@ fi
 %{_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)
 %attr(755,root,root) %{_sbindir}/ab
@@ -2350,11 +2329,14 @@ 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}/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)