diff --git a/.gitignore b/.gitignore index 441ce00..5cfcf57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /commons-lang3-3.0.1-src.tar.gz /commons-lang3-3.1-src.tar.gz /commons-lang3-3.2-src.tar.gz @@ -9,3 +12,5 @@ /commons-lang3-3.5-src.tar.gz /commons-lang3-3.6-src.tar.gz /commons-lang3-3.7-src.tar.gz +/commons-lang3-3.8.1-src.tar.gz +/commons-lang3-3.11-src.tar.gz diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 8776476..edee3ac 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -1,15 +1,20 @@ +%global srcname commons-lang3 + Name: apache-commons-lang3 -Version: 3.8.1 -Release: 7%{?dist} +Version: 3.11 +Release: 1%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -URL: http://commons.apache.org/lang -BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz +URL: https://commons.apache.org/lang +Source0: https://archive.apache.org/dist/commons/lang/source/%{srcname}-%{version}-src.tar.gz + +BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) >= 47 +BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %description @@ -29,32 +34,49 @@ therefore created differently named artifact and jar files. This is the new version, while apache-commons-lang is the compatibility package. -%{?javadoc_package} + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + %prep -%autosetup -n commons-lang3-%{version}-src +%autosetup -n %{srcname}-%{version}-src -%mvn_file : %{name} commons-lang3 +# remove unnecessary maven plugins +%pom_remove_plugin :maven-javadoc-plugin -# testParseSync() test fails on ARM and PPC64LE for unknown reason -sed -i 's/\s*public void testParseSync().*/@org.junit.Ignore\n&/' \ - src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java +%mvn_file : %{name} commons-lang3 -# non-deterministic tests fail randomly -rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java %build -# FIXME tests run against current system version of commons-lang3, not the one being built +# test dependencies are not all packaged for fedora: +# - org.easymock:easymock 4.2 +# - org.junit-pioneer:junit-pioneer +# - org.openjdk.jmh:jmh-core +# - org.openjdk.jmh:jmh-generator-annprocess %mvn_build -f + %install %mvn_install + %files -f .mfiles %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt NOTICE.txt + + %changelog +* Wed Aug 12 2020 Fabio Valentini - 3.11-1 +- Update to version 3.11. +- Fixes RHBZ#1699692 + * Mon Jul 27 2020 Fedora Release Engineering - 3.8.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -178,3 +200,4 @@ rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java * Thu Nov 3 2011 Stanislav Ochotnicky - 3.0.1-1 - Initial version of the package + diff --git a/sources b/sources index 7f7b828..99ba852 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-lang3-3.8.1-src.tar.gz) = 55a03752610be685300ba065520ae47bf74099e217caff4c1da380ff78ca9e7f4838d285ca9b87c34fa87c3787212b7b2d5a22fe99cdbe0bee153fc10ccac67d +SHA512 (commons-lang3-3.11-src.tar.gz) = ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087