commit 04cea688aec9920e3e4f1bfe2082de33bf6db617
Author: spike <spike(a)fedoraproject.org>
Date: Fri Apr 15 04:52:16 2011 +0200
Updated to 1.5.6
Fixed build for maven 3
.gitignore | 1 +
apache-commons-pool.spec | 24 +++++++++++-------------
sources | 1 +
3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3aaf74e..f05ea21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/commons-pool-1.5.5-src.tar.gz
+/commons-pool-1.5.6-src.tar.gz
diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index b5df218..5e990e2 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.5.5
-Release: 5%{?dist}
+Version: 1.5.6
+Release: 1%{?dist}
Summary: Apache Commons Pool Package
Group: Development/Libraries
License: ASL 2.0
@@ -15,7 +15,6 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
-BuildRequires: maven-source-plugin
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -48,12 +47,7 @@ This package contains the API documentation for %{name}.
%setup -q -n %{short_name}-%{version}-src
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
rm -rf %{buildroot}
@@ -101,18 +95,22 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Fri Apr 15 2011 Chris Spike <spike(a)fedoraproject.org> 1.5.6-1
+- Updated to 1.5.6
+- Fixed build for maven 3
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5.5-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 1.5.5-4
+* Tue Nov 9 2010 Chris Spike <spike(a)fedoraproject.org> 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(a)arcor.de> 1.5.5-3
+* Mon Oct 18 2010 Chris Spike <spike(a)fedoraproject.org> 1.5.5-3
- Removed Epoch
-* Tue Oct 5 2010 Chris Spike <chris.spike(a)arcor.de> 1.5.5-2
+* Tue Oct 5 2010 Chris Spike <spike(a)fedoraproject.org> 1.5.5-2
- Consistently using 'buildroot' macro instead of 'RPM_BUILD_ROOT' now
-* Fri Oct 1 2010 Chris Spike <chris.spike(a)arcor.de> 1.5.5-1
+* Fri Oct 1 2010 Chris Spike <spike(a)fedoraproject.org> 1.5.5-1
- Rename and rebase from jakarta-commons-pool
diff --git a/sources b/sources
index 2e750ea..7557ee2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
1a71f00c8ab265efae3724295636f2e0 commons-pool-1.5.5-src.tar.gz
+e024ffad4a52ebd5986c74851f688c0d commons-pool-1.5.6-src.tar.gz