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

commit ef1396badd95c930fd493ab21b8017fde6ffbedf
Author: spike <spike@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@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@arcor.de> 1.5.5-3
- Removed Epoch

--
java-devel mailing list
java-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/java-devel

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

commit f0f974936306c712dfa6df345100ccea580812fc
Author: spike <spike@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@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@arcor.de> 1.2-2
- Removed Epoch

--
java-devel mailing list
java-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/java-devel

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

commit e9fe788f7a7983a3bff76a8dfc11308825dfd75f
Author: spike <spike@fedoraproject.org>
Date: Tue Nov 9 20:29:43 2010 +0100

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

apache-commons-dbcp.spec | 27 +++++++++++++--------------
commons-dbcp.depmap | 10 ----------
2 files changed, 13 insertions(+), 24 deletions(-)
---
diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec
index adce9f5..60266e3 100644
--- a/apache-commons-dbcp.spec
+++ b/apache-commons-dbcp.spec
@@ -3,36 +3,26 @@

Name: apache-%{short_name}
Version: 1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Apache Commons DataBase Pooling Package
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz

-# Depmap needed to remove tomcat* deps (needed only for testing), fix
-# geronimo transaction and find commons-pool.jar
+# Depmap needed to remove tomcat* deps (needed only for testing)
+# and fix geronimo transaction
Source1: %{short_name}.depmap
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
+BuildRequires: apache-commons-parent
BuildRequires: apache-commons-pool
BuildRequires: geronimo-parent-poms
BuildRequires: jta
-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-plugin-cobertura
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin

Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -100,6 +90,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}/
@@ -128,6 +122,11 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}

%changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 1.4-5
+- Removed maven* BRs in favour of apache-commons-parent
+- Added deprecated groupId to depmap for compatibility reasons
+- Removed commons-pool from custom depmap
+
* Wed Oct 27 2010 Chris Spike <chris.spike@arcor.de> 1.4-4
- Added depmap entry to find commons-pool.jar

diff --git a/commons-dbcp.depmap b/commons-dbcp.depmap
index adcb4d8..b0cfbde 100644
--- a/commons-dbcp.depmap
+++ b/commons-dbcp.depmap
@@ -17,14 +17,4 @@
<artifactId>naming-common</artifactId>
</maven>
</dependency>
- <dependency>
- <maven>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-pool</artifactId>
- </jpp>
- </dependency>
</dependencies>
No newline at end of file
--
java-devel mailing list
java-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/java-devel