- internal dummy connection note

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 49997b9f0d12b8ba0365a5e57d4101aadd6bfdac..58988f00e8e67a4289475672bc86d6e23fe612bd 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -11,6 +11,7 @@
 # - 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)
+# - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
 
 # Conditional build:
 %bcond_without ssl             # build without SSL support
@@ -33,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.9
-Release:       10
-License:       Apache
+Version:       2.2.11
+Release:       6
+License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 80d3754fc278338033296f0d41ef2c04
+# Source0-md5: 03e0a99a5de0f3f568a0087fb9993af9
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -90,9 +91,10 @@ Patch19:     %{name}-conffile-path.patch
 Patch20:       %{name}-apxs.patch
 # http://www.telana.com/peruser.php (2.2.3-0.3.0)
 Patch21:       httpd-peruser.patch
-Patch22:       %{name}-libtool.patch
 Patch23:       %{name}-suexec_fcgi.patch
 Patch24:       %{name}-revert-bug-40463.patch
+Patch25:       %{name}-prefork-graceful-fix.patch
+Patch26:       %{name}-pollset-segv.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.2
 BuildRequires: apr-util-devel >= 1:1.3
@@ -112,12 +114,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}
@@ -191,13 +190,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
 Provides:      apache(modules-api) = %{_apache_modules_api}
 Provides:      group(http)
 Provides:      user(http)
@@ -1384,6 +1380,7 @@ Summary(pl.UTF-8):        Wiązanie określonych rozszerzeń plików z zachowaniem i za
 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
@@ -1749,9 +1746,10 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p0
+%patch26 -p0
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -2346,8 +2344,6 @@ fi
 %files index
 %defattr(644,root,root,755)
 %config(noreplace,missingok) %{_datadir}/html/index.html*
-%{_datadir}/html/*.gif
-%{_datadir}/html/*.png
 
 %files tools
 %defattr(644,root,root,755)