From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 25 Nov 2005 11:29:13 +0000 (+0000)
Subject: - if compiled without ipv6, then conflict with apache compiled with ipv6
X-Git-Tag: auto/ac/apache1-mod_rpaf-0_5-1~3
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?p=packages%2Fapache1-mod_rpaf.git;a=commitdiff_plain;h=fc6d7217828ddd2a508791061e620eac1e290996

- if compiled without ipv6, then conflict with apache compiled with ipv6

Changed files:
    apache1-mod_rpaf.spec -> 1.12
---

diff --git a/apache1-mod_rpaf.spec b/apache1-mod_rpaf.spec
index 85d568f..f387507 100644
--- a/apache1-mod_rpaf.spec
+++ b/apache1-mod_rpaf.spec
@@ -1,15 +1,15 @@
 # TODO
-# - compile fails when apache1 is compiled with ipv6
-
+# - need ipv6 support
+#
 %bcond_with	ipv6		# disable IPv6 support
-
+#
 %define		mod_name	rpaf
 %define 	apxs		%{_sbindir}/apxs1
 Summary:	Reverse proxy add forward module for Apache
 Summary(pl):	Modu³ Apache'a dodaj±cy przekazywanie dla odwrotnych proxy
 Name:		apache1-mod_%{mod_name}
 Version:	0.5
-Release:	0.14
+Release:	0.15
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://stderr.net/apache/rpaf/download/mod_%{mod_name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Source1:	%{name}.conf
 URL:		http://stderr.net/apache/rpaf/
 BuildRequires:	apache1-devel >= 1.3.33-2
 %{!?with_ipv6:BuildConflicts:	apache1(ipv6)-devel}
+%{!?with_ipv6:Conflicts:	apache1(ipv6)}
 Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)