From 0b89c087b35d712a3bee5266200a589b13e2376f Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 12:42:54 -0500 Subject: [PATCH] Import rpm: fa38779d74a484ea36060d064906428e02ffeb6b --- .gitignore | 2 +- apache-commons-lang3.spec | 126 ++++++++++---------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 9149884..df5f539 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-lang3-3.7-src.tar.gz +SOURCES/commons-lang3-3.1-src.tar.gz diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 1d684ea..8924097 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -1,16 +1,22 @@ -Name: apache-commons-lang3 -Version: 3.7 -Release: 3%{?dist} +%global base_name lang +%global short_name commons-%{base_name}3 + +Name: apache-%{short_name} +Version: 3.1 +Release: 9%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -URL: http://commons.apache.org/lang +URL: http://commons.apache.org/%{base_name} +Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang3-%{version}-src.tar.gz - BuildRequires: maven-local -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.commons:commons-parent) >= 26-7 +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +%if 0%{?rhel} <= 0 +BuildRequires: mvn(org.easymock:easymock) +%endif %description The standard Java libraries fail to provide enough methods for @@ -29,103 +35,38 @@ 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: API documentation for %{name} + +%description javadoc +%{summary}. %prep -%autosetup -n commons-lang3-%{version}-src - -%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&/' \ - src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java - -# non-deterministic tests fail randomly -rm src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java +%setup -q -n %{short_name}-%{version}-src +%mvn_file : %{name} %{short_name} %build -# FIXME tests run against current system version of commons-lang3, not the one being built -%mvn_build -f +%mvn_build %{?rhel:-f} %install %mvn_install %files -f .mfiles -%license LICENSE.txt NOTICE.txt -%doc RELEASE-NOTES.txt +%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt %changelog -* Wed Feb 07 2018 Fedora Release Engineering - 3.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri Dec 27 2013 Daniel Mach - 3.1-9 +- Mass rebuild 2013-12-27 -* Mon Jan 29 2018 Mikolaj Izdebski - 3.7-2 -- Cleanup spec file +* Fri Sep 20 2013 Mikolaj Izdebski - 3.1-8 +- Add BuildRequires on apache-commons-parent >= 26-7 -* Thu Nov 09 2017 Michael Simacek - 3.7-1 -- Update to upstream version 3.7 - -* Wed Jul 26 2017 Fedora Release Engineering - 3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 10 2017 Mikolaj Izdebski - 3.6-2 -- Conditionalize BR on jmh - -* 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 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 19 2016 Michael Simacek - 3.5-1 -- Update to upstream version 3.5 - -* Wed Mar 09 2016 Michael Simacek - 3.4-5 -- Fix unapplied patch - -* Mon Feb 15 2016 Michael Simacek - 3.4-4 -- Fix parsing of ISO dates with UTC TZ - -* Wed Feb 03 2016 Fedora Release Engineering - 3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 12 2015 Alexander Kurtakov 3.4-1 -- Update to upstream 3.4. - -* Wed Jul 30 2014 Mikolaj Izdebski - 3.3.2-3 -- Fix build-requires on apache-commons-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Mikolaj Izdebski - 3.3.2-1 -- Update to upstream version 3.3.2 - -* Thu Mar 20 2014 Mikolaj Izdebski - 3.3.1-2 -- Disable test failing on PPC64LE - -* Thu Mar 20 2014 Mikolaj Izdebski - 3.3.1-1 -- Update to upstream version 3.3.1 - -* Tue Mar 11 2014 Mikolaj Izdebski - 3.3-1 -- Update to upstream version 3.3 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2.1-2 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Jan 9 2014 Mikolaj Izdebski - 3.2.1-1 -- Update to upstream version 3.2.1 - -* Thu Jan 2 2014 Mikolaj Izdebski - 3.2-1 -- Update to upstream version 3.2 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Fri Jun 28 2013 Mikolaj Izdebski - 3.1-7 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 * Wed May 29 2013 Mikolaj Izdebski - 3.1-6 - Build with xmvn @@ -152,3 +93,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 a00bba5..133d792 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-lang3-3.7-src.tar.gz) = 12d7fb1694ec8fdc85f4c222e4218949d9a5c06cb6ad34763a7a32457b125551cac3ad3631ed299479b86e46a9e769095e96d6fd6799d8a522facc77b1ef02ef +SHA1 (commons-lang3-3.1-src.tar.gz) = 5a7d052fb18727ad6fd1c2fbc9708fbf06b8c1ce