[java-sig-commits] [maven] Use Obsoletes instead of Conflicts

[Stanislav Ochotnicky]

commit c45bdfa27207d5dc4984b60e99900ebe3de355f0
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Mon May 14 13:57:27 2012 +0200

    Use Obsoletes instead of Conflicts

 maven.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 81d2d65..2132fc4 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
 
 Name:           maven
 Version:        3.0.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -104,7 +104,7 @@ Obsoletes:      %{name} < 0:%{version}-%{release}
 
 # maven2 bin package no longer exists. Replace it
 # these should be around until F20
-Conflicts:      maven2 < 2.2.1-99
+Obsoletes:      maven2 < 2.2.1-99
 Provides:       maven2 = %{version}-%{release}
 
 %description
@@ -359,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'`
%{_datadir}/%{name}/repository-jni/JPP
 
 
 %changelog
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 3.0.4-5
+- Use Obsoletes instead of Conflicts
+
 * Mon May 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 3.0.4-4
 - Obsolete and provide maven2