[java-sig-commits] [maven] Obsolete and provide maven2
Stanislav Ochotnicky
sochotni at fedoraproject.org
Mon May 14 08:28:23 UTC 2012
commit 058da9b05bff4dd52b6c87ae82864c36797f87f9
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon May 14 10:19:19 2012 +0200
Obsolete and provide maven2
maven.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 549b906..81d2d65 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -102,8 +102,10 @@ Requires: xerces-j2
# for noarch->arch change
Obsoletes: %{name} < 0:%{version}-%{release}
-# maven now provides "mvn" script and new maven2 mvn2
-Conflicts: maven2 < 2.2.1-28
+# maven2 bin package no longer exists. Replace it
+# these should be around until F20
+Conflicts: maven2 < 2.2.1-99
+Provides: maven2 = %{version}-%{release}
%description
Maven is a software project management and comprehension tool. Based on the
@@ -357,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-4
+- Obsolete and provide maven2
+
* Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-3
- Make package noarch again to simplify bootstrapping
More information about the java-sig-commits
mailing list