- drop unpopular asis and cern_meta packages from main package

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index ba319c2357895419dbcec7b1f86e7fc2d256c9c2..0521e8dd313a8823a2592cfb0d221e6a678c6b51 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
 Version:       2.2.11
-Release:       3
+Release:       5
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -93,6 +93,7 @@ Patch21:      httpd-peruser.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 +113,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}
@@ -195,7 +193,6 @@ Requires:   /sbin/chkconfig
 Requires:      apr >= 1:1.2
 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)
@@ -1751,6 +1748,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p0
+%patch26 -p0
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}