From 3885a2d836c5bb2cba3d6742404a223b36207a22 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jul 03 2017 09:00:10 +0000 Subject: Update to upstream version 3.6 --- diff --git a/.gitignore b/.gitignore index 55d03cc..9dd0356 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /commons-lang3-3.3.2-src.tar.gz /commons-lang3-3.4-src.tar.gz /commons-lang3-3.5-src.tar.gz +/commons-lang3-3.6-src.tar.gz diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 880ff54..47ca7d9 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -1,24 +1,21 @@ -%global base_name lang -%global short_name commons-%{base_name}3 - -Name: apache-%{short_name} -Version: 3.5 -Release: 3%{?dist} +Name: apache-commons-lang3 +Version: 3.6 +Release: 1%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -URL: http://commons.apache.org/%{base_name} -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +URL: http://commons.apache.org/lang +Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.bcel:bcel) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -%if 0%{?rhel} <= 0 -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.hamcrest:hamcrest-all) BuildRequires: mvn(org.easymock:easymock) -%endif +BuildRequires: mvn(org.hamcrest:hamcrest-all) +BuildRequires: mvn(org.openjdk.jmh:jmh-core) +BuildRequires: mvn(org.openjdk.jmh:jmh-generator-annprocess) %description The standard Java libraries fail to provide enough methods for @@ -44,9 +41,9 @@ Summary: API documentation for %{name} %{summary}. %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-lang3-%{version}-src -%mvn_file : %{name} %{short_name} +%mvn_file : %{name} commons-lang3 # testParseSync() test fails on ARM and PPC64LE for unknown reason sed -i 's/\s*public void testParseSync().*/@org.junit.Ignore\n&/' \ @@ -56,7 +53,7 @@ sed -i 's/\s*public void testParseSync().*/@org.junit.Ignore\n&/' \ rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java %build -%mvn_build %{?rhel:-f} +%mvn_build %install %mvn_install @@ -68,6 +65,9 @@ rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jul 03 2017 Michael Simacek - 3.6-1 +- Update to upstream version 3.6 + * Tue Mar 14 2017 Michael Simacek - 3.5-3 - Disable non-deterministic test diff --git a/sources b/sources index bb95a08..697502e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be37aeba82da47428570a7bd7651b41e commons-lang3-3.5-src.tar.gz +SHA512 (commons-lang3-3.6-src.tar.gz) = fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a