- Conflicts with apr from apache (which contained apr-util); release 2

Changed files:
    apr-compat.spec -> 1.10

diff --git a/apr-compat.spec b/apr-compat.spec
index 7fb2dfc92648032c2775194a6e28ff690d45bc92..7b0087a2705c506cb8110cebe6b10a22c77da33b 100644 (file)
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -2,7 +2,7 @@ Summary:        Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
 Version:       0.9.4
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Libraries
@@ -13,6 +13,7 @@ URL:          http://apr.apache.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: libtool >= 1.3.3
 BuildRequires: perl-base
+Conflicts:     apr < 1:0.9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr
@@ -44,6 +45,7 @@ Summary:      Header files and development documentation for apr
 Summary(pl):   Pliki nag³ówkowe i dokumentacja programisty do apr
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Conflicts:     apr-devel < 1:0.9
 
 %description devel
 Header files and development documentation for apr.
@@ -56,6 +58,7 @@ Summary:      Static apr library
 Summary(pl):   Statyczna biblioteka apr
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts:     apr-static < 1:0.9
 
 %description static
 Static apr library.