[fedora-java] [apache-commons-pool] Removed maven* BRs in favour of apache-commons-parent Added deprecated groupId to depmap for compati

spike spike at fedoraproject.org
Tue Nov 9 08:35:42 UTC 2010


commit ef1396badd95c930fd493ab21b8017fde6ffbedf
Author: spike <spike at fedoraproject.org>
Date:   Tue Nov 9 09:33:10 2010 +0100

    Removed maven* BRs in favour of apache-commons-parent
    Added deprecated groupId to depmap for compatibility reasons

 apache-commons-pool.spec |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index 0c7657d..4a6a039 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          1.5.5
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Apache Commons Pool Package
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -14,18 +14,8 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2
-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:    apache-commons-parent
 BuildRequires:    maven-source-plugin
-BuildRequires:    maven-surefire-plugin
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
@@ -79,6 +69,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}/
@@ -107,6 +101,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike at arcor.de> 1.5.5-4
+- 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 at arcor.de> 1.5.5-3
 - Removed Epoch
 


More information about the java-devel mailing list