- updated db4 patch: old content was obsolete, now it adds db5.0 support

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index 6ac3223edb6623206bb2b606f66cf6d5c0931ba4..14ef38403233462a1bcb151a6ff1f04f7b36cd86 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -1,11 +1,13 @@
 # TODO
 # - add -D_FILE_OFFSET_BITS=64 somewhere to get >2GB logfiles support
+# - 1.3.42 is last formal release, patches _may_ be available in the fugture in
+#   http://www.apache.org/dist/httpd/patches/
 #
 # Conditional build:
 %bcond_with    rewrite_ldap    # enable ldap map support for mod_rewrite (alpha)
 %bcond_without ipv6            # disable IPv6 support
 %bcond_without lingerd         # don't build lingerd support
-#
+
 %include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
 Summary(cs.UTF-8):     Nejrozšířenější WWW server v Internetu
@@ -29,12 +31,12 @@ Summary(tr.UTF-8):  Lider WWW tarayıcı
 Summary(uk.UTF-8):     Найпопулярніший Web-Server
 Summary(zh_CN.UTF-8):  Internet 上应用最广泛的 Web 服务程序。
 Name:          apache1
-Version:       1.3.41
-Release:       13
+Version:       1.3.42
+Release:       4
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
-# Source0-md5: f7f00b635243f03a787ca9f4d4c85651
+# Source0-md5: b76695ec68f9f8b512c9415fc69c1019
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -108,6 +110,7 @@ Patch39:    %{name}-security_htdigest_local_buffer_overflow.patch
 Patch40:       %{name}-security_htpasswd_user_buffer_overflow.patch
 Patch41:       %{name}-security_check_forensic_tempfiles.patch
 Patch42:       %{name}-lingerd.patch
+Patch43:       %{name}-getline.patch
 URL:           http://httpd.apache.org/
 BuildRequires: bash
 BuildRequires: db-devel >= 4.1
@@ -248,7 +251,6 @@ Requires:   /etc/mime.types
 Requires:      mailcap
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts
-Requires:      webapps
 Provides:      %{name}(EAPI) = %{version}-%{release}
 %{?with_ipv6:Provides: apache1(ipv6)}
 %{?with_lingerd:Provides:      apache1(lingerd)}
@@ -991,6 +993,7 @@ Summary(pl.UTF-8):  Określanie typów dokumentów przy użyciu rozszerzeń plik
 Group:         Networking/Daemons/HTTP
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_mime) = %{version}-%{release}
+Provides:      webserver(mime)
 
 %description mod_mime
 This module is used to determine various bits of "meta information"
@@ -1113,6 +1116,7 @@ Summary(pl.UTF-8):        Moduł do ,,przepisywania'' adresów URL w locie
 Group:         Networking/Daemons/HTTP
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_rewrite) = %{version}-%{release}
+Provides:      webserver(rewrite)
 Obsoletes:     apache-mod_rewrite < 2.0.0
 
 %description mod_rewrite
@@ -1341,13 +1345,13 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch39 -p2
 %patch40 -p2
 %patch41 -p2
-
 %if %{with lingerd}
 mkdir -p lingerd
 cp -a lingerd-*/{README,TUNING,LICENSE,TODO,ChangeLog} lingerd
 cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main
 %patch42 -p1
 %endif
+%patch43 -p1
 
 # make manual link with full path
 %{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.*
@@ -1398,7 +1402,7 @@ rm -f src/modules/standard/mod_rewrite.so
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
        $RPM_BUILD_ROOT%{httpdir}/html \
        $RPM_BUILD_ROOT%{_libexecdir} \
        $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache}
@@ -1916,11 +1920,12 @@ fi
 %doc conf/mime.types conf/apache.conf.dist
 %{?with_lingerd:%doc lingerd}
 %attr(754,root,root) /etc/rc.d/init.d/apache
-%attr(750,root,root) %dir %{_sysconfdir}
+%attr(751,root,root) %dir %{_sysconfdir}
 %{_sysconfdir}/modules
 %{_sysconfdir}/logs
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
+%attr(750,root,root) %dir %{_sysconfdir}/vhosts.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apache