From a7189ab7d78be156ab824591e385ceff5c22eb2d Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 14 Nov 2003 10:13:03 +0000
Subject: [PATCH] - Conflicts with apr from apache (which contained apr-util);
 release 2

Changed files:
    apr-util.spec -> 1.8
---
 apr-util.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apr-util.spec b/apr-util.spec
index 554868f..2731c70 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -5,7 +5,7 @@ Summary:	A companion library to Apache Portable Runtime
 Summary(pl):	Biblioteka towarzysz±ca Apache Portable Runtime
 Name:		apr-util
 Version:	0.9.4
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache
 Group:		Libraries
@@ -20,6 +20,7 @@ BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel}
+Conflicts:	apr < 1:0.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_includedir	/usr/include/apr-util
@@ -37,6 +38,7 @@ Summary(pl):	Pliki nag
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	apr-devel
+Conflicts:	apr-devel < 1:0.9
 
 %description devel
 Header files and development documentation for apr-util.
@@ -49,6 +51,7 @@ Summary:	Static apr-util library
 Summary(pl):	Statyczna biblioteka apr-util
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts:	apr-static < 1:0.9
 
 %description static
 Static apr-util library.
-- 
2.44.0