8f6174c0d291856f38cdac6cdb632a3a httpd.init

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 77e399d2d3a82c9c5a786142ba94a27a6fbaf4de..5a7963aa0190265edc5d88a437173cb9beff87ce 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 # mod_rewrite_ldap - enable ldap map supoort for mod_rewrite (alpha)
-# bcond_off_apache_ipv6 - disable IPv6 support
+# _without_apache_ipv6 - disable IPv6 support
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
@@ -11,7 +11,7 @@ Summary(pl):  Serwer WWW (World Wide Web)
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       1.3.20
-Release:       1
+Release:       2
 License:       Apache Group License
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -47,6 +47,7 @@ Patch17:      %{name}-mkstemp.patch
 Patch18:       %{name}-EAPI-missing_files.patch
 Patch19:       %{name}-mod_include-segv.patch
 Patch20:       %{name}-PLD-nov6.patch
+Patch21:       %{name}-configdir_skip_backups.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires:  db3-devel
 BuildRequires: mm-devel >= 1.1.3
@@ -498,7 +499,7 @@ wa
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-%{!?bcond_off_apache_ipv6:%patch9 -p1}
+%{!?_without_apache_ipv6:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -509,7 +510,8 @@ wa
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%{?bcond_off_apache_ipv6:%patch20 -p1}
+%{?_without_apache_ipv6:%patch20 -p1}
+%patch21 -p1
 
 %build
 OPTIM="%{rpmcflags}" \
@@ -536,7 +538,7 @@ OPTIM="%{rpmcflags}" \
        --suexec-docroot=%{_datadir} \
        --disable-rule=WANTHSREGEX \
        --enable-rule=EAPI \
-       %{!?bcond_off_apache_ipv6:--enable-rule=INET6}
+       %{!?_without_apache_ipv6:--enable-rule=INET6}
 
 %{__make} LIBS1="-lm -lcrypt -lmm -ldl"