Updated to 1.5.6

Fixed build for maven 3
This commit is contained in:
spike 2011-04-15 04:52:16 +02:00
commit 04cea688ae
3 changed files with 13 additions and 13 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/commons-pool-1.5.5-src.tar.gz
/commons-pool-1.5.6-src.tar.gz

View file

@ -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@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@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@arcor.de> 1.5.5-4
* Tue Nov 9 2010 Chris Spike <spike@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@arcor.de> 1.5.5-3
* Mon Oct 18 2010 Chris Spike <spike@fedoraproject.org> 1.5.5-3
- Removed Epoch
* Tue Oct 5 2010 Chris Spike <chris.spike@arcor.de> 1.5.5-2
* Tue Oct 5 2010 Chris Spike <spike@fedoraproject.org> 1.5.5-2
- Consistently using 'buildroot' macro instead of 'RPM_BUILD_ROOT' now
* Fri Oct 1 2010 Chris Spike <chris.spike@arcor.de> 1.5.5-1
* Fri Oct 1 2010 Chris Spike <spike@fedoraproject.org> 1.5.5-1
- Rename and rebase from jakarta-commons-pool

View file

@ -1 +1,2 @@
1a71f00c8ab265efae3724295636f2e0 commons-pool-1.5.5-src.tar.gz
e024ffad4a52ebd5986c74851f688c0d commons-pool-1.5.6-src.tar.gz