diff --git a/.gitignore b/.gitignore index ffaae1f..27b86ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ commons-codec-1.4-src.tar.gz +commons-codec-1.6-src.tar.gz diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 21cfaee..fcbe793 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.4 -Release: 13%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Implementations of common encoders and decoders Group: Development/Libraries License: ASL 2.0 @@ -26,8 +26,8 @@ BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin BuildRequires: maven-doxia-sitetools BuildRequires: maven-plugin-bundle -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 Requires: java >= 1:1.6.0 Requires: jpackage-utils @@ -57,7 +57,7 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release} sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %build -mvn-rpmbuild install javadoc:javadoc +mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:javadoc %install # jars @@ -84,6 +84,9 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom %{_javadocdir}/%{name} %changelog +* Wed Dec 7 2011 akurtakov 1.6-1 +- Update to latest upstream (1.6). + * Wed Nov 30 2011 Alexander Kurtakov 1.4-13 - Build with maven 3. - Adapt to current guidelines. diff --git a/sources b/sources index 1e29553..e912780 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d96f8134e12cdab105d4934b90cb993 commons-codec-1.4-src.tar.gz +2e482c7567908d334785ce7d69ddfff7 commons-codec-1.6-src.tar.gz