commit f0f974936306c712dfa6df345100ccea580812fc
Author: spike <spike(a)fedoraproject.org>
Date: Tue Nov 9 09:37:01 2010 +0100
Removed maven* BRs in favour of apache-commons-parent
Added deprecated groupId to depmap for compatibility reasons
apache-commons-cli.spec | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index 9c320d2..ddff3ce 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Command Line Interface Library for Java
Group: Development/Libraries
License: ASL 2.0
@@ -14,17 +14,7 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2 >= 2.2.1
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-idea-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
+BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -75,6 +65,10 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+# following line is only for backwards compatibility. New packages
+# should use proper groupid org.apache.commons and also artifactid
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
@@ -104,6 +98,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 1.2-3
+- Removed maven* BRs in favour of apache-commons-parent
+- Added deprecated groupId to depmap for compatibility reasons
+
* Mon Oct 18 2010 Chris Spike <chris.spike(a)arcor.de> 1.2-2
- Removed Epoch