From 66c10bea1ab7e572a2791afdba1fd1bdc17104f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:20:02 +0000 Subject: [PATCH 01/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 2975915..dac2393 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 Group: Development/Libraries @@ -64,6 +64,9 @@ sed -i 's/\r//' *.txt *.html %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d2f2bbb586e855e619a5b06167c783ee7b5edba0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 02/18] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 32fef78..b5690d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37ee469f4caff6cfa28f9d0a0be2d4d2 commons-lang-2.6-src.tar.gz +SHA512 (commons-lang-2.6-src.tar.gz) = 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 From e6d4e7d9fa31e019961cd0e69d6639c1590662d1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:48:42 +0000 Subject: [PATCH 03/18] Remove Group tags --- apache-commons-lang.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 2975915..9f6b15c 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -7,7 +7,6 @@ Version: 2.6 Release: 21%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch @@ -31,7 +30,6 @@ as hashCode, toString and equals. %package javadoc Summary: API documentation for %{name} -Group: Documentation %description javadoc %{summary}. From c04e6947bcc69091cc69a659b8b91694ee03b868 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 04/18] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- apache-commons-lang.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index dac2393..4fcbefa 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -7,7 +7,6 @@ Version: 2.6 Release: 22%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch @@ -31,7 +30,6 @@ as hashCode, toString and equals. %package javadoc Summary: API documentation for %{name} -Group: Documentation %description javadoc %{summary}. From d4e9e85635199d72063db214b1733efd6d752f29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:29:06 +0000 Subject: [PATCH 05/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 4fcbefa..e60b6e7 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -62,6 +62,9 @@ sed -i 's/\r//' *.txt *.html %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 51519ed6df4e2ad0a3139e6ef195ee3a336c1c6c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 7 Feb 2019 17:22:06 +0000 Subject: [PATCH 06/18] Rebuild to regenerate OSGi metadata --- apache-commons-lang.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index e60b6e7..ab8b105 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -50,18 +50,22 @@ sed -i 's/\r//' *.txt *.html %mvn_config buildSettings/compilerSource 1.3 %build -%mvn_build +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang %install %mvn_install %files -f .mfiles -%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog +* Thu Feb 07 2019 Mat Booth - 2.6-24 +- Rebuild to regenerate OSGi metadata + * Thu Jan 31 2019 Fedora Release Engineering - 2.6-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c3b1e9cecee13c2bdaa1b63cb9eeab0bbbe93fa1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:18 +0200 Subject: [PATCH 07/18] Mass rebuild for javapackages-tools 201901 --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 9f6b15c..6584087 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -62,6 +62,9 @@ sed -i 's/\r//' *.txt *.html %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.6-22 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 2.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 32f1c7783cbb03e6aa5faed22a9b5ff638c1ae0e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 08:28:48 +0200 Subject: [PATCH 08/18] Disable javadoc package --- apache-commons-lang.spec | 52 ++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 6584087..7476873 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -1,20 +1,18 @@ - -%global base_name lang -%global short_name commons-%{base_name} - -Name: apache-%{short_name} +Name: apache-commons-lang Version: 2.6 -Release: 22%{?dist} +Release: 23%{?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 +BuildArch: noarch + +Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang-%{version}-src.tar.gz + Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch -BuildArch: noarch BuildRequires: maven-local -BuildRequires: apache-commons-parent -BuildRequires: maven-surefire-provider-junit +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) %description The standard Java libraries fail to provide enough methods for @@ -28,40 +26,30 @@ exception structure that supports multiple types of nested-Exceptions and a series of utilities dedicated to help with building methods, such as hashCode, toString and equals. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-lang-%{version}-src %patch1 -p1 sed -i 's/\r//' *.txt *.html -# "enum" is used as a Java identifier, which is prohibited in Java >= 1.5 -%pom_add_plugin org.apache.maven.plugins:maven-javadoc-plugin . " - 1.3" - - -%mvn_file : %{name} %{short_name} -%mvn_alias : org.apache.commons: %{base_name}:%{base_name} -# this package needs to be compiled with -source 1.3 option -%mvn_config buildSettings/compilerSource 1.3 +%mvn_file : %{name} commons-lang +%mvn_alias : org.apache.commons: lang:lang %build -%mvn_build +# "enum" is used as a Java identifier, which is prohibited in Java >= 1.5 +# Likewise, javadoc fails to generate due to "enum" +%mvn_build -j -- -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 %install %mvn_install %files -f .mfiles -%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 2.6-23 +- Disable javadoc package + * Fri May 24 2019 Mikolaj Izdebski - 2.6-22 - Mass rebuild for javapackages-tools 201901 From c5668ae28e1c8f645bbeebb4c042fbd9bfba707a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:05:41 +0000 Subject: [PATCH 09/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index ab8b105..2c60ea8 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -63,6 +63,9 @@ sed -i 's/\r//' *.txt *.html %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.6-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 07 2019 Mat Booth - 2.6-24 - Rebuild to regenerate OSGi metadata From d8a053fdcba086d4ca4f50d698582bf22dab38be Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Nov 2019 12:58:21 +0100 Subject: [PATCH 10/18] override maven compiler source and target that works with xmvn 3.1.0 --- apache-commons-lang.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 2c60ea8..33227cd 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -46,11 +46,9 @@ sed -i 's/\r//' *.txt *.html %mvn_file : %{name} %{short_name} %mvn_alias : org.apache.commons: %{base_name}:%{base_name} -# this package needs to be compiled with -source 1.3 option -%mvn_config buildSettings/compilerSource 1.3 %build -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 %install %mvn_install @@ -63,6 +61,9 @@ sed -i 's/\r//' *.txt *.html %license LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Fabio Valentini - 2.6-26 +- Use override for maven compiler source and target that works with xmvn 3.1.0. + * Wed Jul 24 2019 Fedora Release Engineering - 2.6-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b13daa281c070695f2bf4e92c856d734af7dc83c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:45:49 +0000 Subject: [PATCH 11/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 33227cd..2748afd 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -61,6 +61,9 @@ sed -i 's/\r//' *.txt *.html %license LICENSE.txt NOTICE.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.6-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Fabio Valentini - 2.6-26 - Use override for maven compiler source and target that works with xmvn 3.1.0. From 73b4ce14197e8053b4d554b1df100d4360442a34 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 25 Jun 2020 15:27:43 -0400 Subject: [PATCH 12/18] Force Java 8 as we cannot build for Java 11 without breaking API. - org.apache.commons.lang.enum will not build on any target greater than 1.5 so force Java 8 for now Signed-off-by: Roland Grunberg --- apache-commons-lang.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 2748afd..873245f 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -12,6 +12,7 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{sho Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch BuildArch: noarch +BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven-local BuildRequires: apache-commons-parent BuildRequires: maven-surefire-provider-junit @@ -48,6 +49,7 @@ sed -i 's/\r//' *.txt *.html %mvn_alias : org.apache.commons: %{base_name}:%{base_name} %build +export JAVA_HOME=%{_jvmdir}/java-1.8.0 %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 %install @@ -61,6 +63,9 @@ sed -i 's/\r//' *.txt *.html %license LICENSE.txt NOTICE.txt %changelog +* Thu Jun 25 2020 Roland Grunberg - 2.6-28 +- Force Java 8 as we cannot build for Java 11 without breaking API. + * Tue Jan 28 2020 Fedora Release Engineering - 2.6-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4b6d0b86d0a7733b21dd22fb26c6aa4153811623 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 9 Jul 2020 18:26:10 +0100 Subject: [PATCH 13/18] Pass javadoc source parameter as a property so it can be used by the xmvn javadoc mojo --- apache-commons-lang.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 873245f..c059711 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -40,17 +40,12 @@ Summary: API documentation for %{name} %patch1 -p1 sed -i 's/\r//' *.txt *.html -# "enum" is used as a Java identifier, which is prohibited in Java >= 1.5 -%pom_add_plugin org.apache.maven.plugins:maven-javadoc-plugin . " - 1.3" - - %mvn_file : %{name} %{short_name} %mvn_alias : org.apache.commons: %{base_name}:%{base_name} %build export JAVA_HOME=%{_jvmdir}/java-1.8.0 -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 -Dsource=1.3 %install %mvn_install @@ -63,6 +58,10 @@ export JAVA_HOME=%{_jvmdir}/java-1.8.0 %license LICENSE.txt NOTICE.txt %changelog +* Thu Jul 09 2020 Mat Booth - 2.6-29 +- Pass javadoc source parameter as a property so it can be used by the xmvn + javadoc mojo + * Thu Jun 25 2020 Roland Grunberg - 2.6-28 - Force Java 8 as we cannot build for Java 11 without breaking API. From aaaa07cf2eb57039d15b98d4a18301b4cf5b9507 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:37:58 +0200 Subject: [PATCH 14/18] Rebuilt for JDK-11 --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index c059711..00b6d88 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -58,6 +58,9 @@ export JAVA_HOME=%{_jvmdir}/java-1.8.0 %license LICENSE.txt NOTICE.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.6-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jul 09 2020 Mat Booth - 2.6-29 - Pass javadoc source parameter as a property so it can be used by the xmvn javadoc mojo From 504fb5ebd34b1d96a3f4fde45d4f351782f6f00d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:11:10 +0000 Subject: [PATCH 15/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 00b6d88..a8125e8 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -58,6 +58,9 @@ export JAVA_HOME=%{_jvmdir}/java-1.8.0 %license LICENSE.txt NOTICE.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.6-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 2.6-30 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From ea0a295711ba4ab749eac8b90fcb5c8f050bf222 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 15 Aug 2020 23:03:26 +0200 Subject: [PATCH 16/18] remove unused enum package, compile with Java 11, target Java 8 --- ...-FastDateFormat-for-Java-7-behaviour.patch | 2 +- apache-commons-lang.spec | 40 ++++++++++++++----- 2 files changed, 32 insertions(+), 10 deletions(-) rename 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch => 0000-Fix-FastDateFormat-for-Java-7-behaviour.patch (97%) diff --git a/0002-Fix-FastDateFormat-for-Java-7-behaviour.patch b/0000-Fix-FastDateFormat-for-Java-7-behaviour.patch similarity index 97% rename from 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch rename to 0000-Fix-FastDateFormat-for-Java-7-behaviour.patch index ccd05a0..122e56c 100644 --- a/0002-Fix-FastDateFormat-for-Java-7-behaviour.patch +++ b/0000-Fix-FastDateFormat-for-Java-7-behaviour.patch @@ -1,7 +1,7 @@ From 6af11cb2cfdf83ce013a531005077259984c55e7 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 22 Feb 2012 11:21:06 +0100 -Subject: [PATCH 2/2] Fix FastDateFormat for Java 7 behaviour +Subject: [PATCH] Fix FastDateFormat for Java 7 behaviour Backported from 1146138 See https://issues.apache.org/jira/browse/LANG-719 for more information diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index a8125e8..14cd1ea 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -1,18 +1,18 @@ - %global base_name lang %global short_name commons-%{base_name} Name: apache-%{short_name} Version: 2.6 -Release: 31%{?dist} +Release: 32%{?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 -Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch + +URL: https://commons.apache.org/%{base_name} +Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Patch0: 0000-Fix-FastDateFormat-for-Java-7-behaviour.patch BuildArch: noarch -BuildRequires: java-1.8.0-openjdk-devel + BuildRequires: maven-local BuildRequires: apache-commons-parent BuildRequires: maven-surefire-provider-junit @@ -37,15 +37,32 @@ Summary: API documentation for %{name} %prep %setup -q -n %{short_name}-%{version}-src -%patch1 -p1 +%patch0 -p1 + sed -i 's/\r//' *.txt *.html %mvn_file : %{name} %{short_name} %mvn_alias : org.apache.commons: %{base_name}:%{base_name} +# remove org.apache.commons.lang.enum package +# "enum" is a keyword since Java 4 and cannot be used as an identifier +rm -r src/main/java/org/apache/commons/lang/enum/ +rm -r src/test/java/org/apache/commons/lang/enum/ +rm src/test/java/org/apache/commons/lang/enums/EnumTest.java + +# convert some stray ISO-8859-1 characters to UTF-8 +iconv -f ISO-8859-1 -t UTF-8 \ + src/main/java/org/apache/commons/lang/Entities.java > \ + src/main/java/org/apache/commons/lang/Entities.java.utf-8 +mv src/main/java/org/apache/commons/lang/Entities.java.utf-8 \ + src/main/java/org/apache/commons/lang/Entities.java + %build -export JAVA_HOME=%{_jvmdir}/java-1.8.0 -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.lang -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 -Dsource=1.3 +%mvn_build -- \ + -Dcommons.osgi.symbolicName=org.apache.commons.lang \ + -Dmaven.compiler.source=1.8 \ + -Dmaven.compiler.target=1.8 \ + -Dsource=1.8 %install %mvn_install @@ -58,6 +75,11 @@ export JAVA_HOME=%{_jvmdir}/java-1.8.0 %license LICENSE.txt NOTICE.txt %changelog +* Sat Aug 15 2020 Fabio Valentini - 2.6-32 +- Remove unused org.apache.commons.lang.enum package. +- Compile with Java 11, target Java 8 (instead of Java 8 targeting Java 3). +- Remove stray encoding issues, convert to UTF-8. + * Mon Jul 27 2020 Fedora Release Engineering - 2.6-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From bb6d7cb6fe5105831021bf0d43481d13b7b2138b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:14:48 +0000 Subject: [PATCH 17/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 14cd1ea..df5163b 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 @@ -75,6 +75,9 @@ mv src/main/java/org/apache/commons/lang/Entities.java.utf-8 \ %license LICENSE.txt NOTICE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.6-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 15 2020 Fabio Valentini - 2.6-32 - Remove unused org.apache.commons.lang.enum package. - Compile with Java 11, target Java 8 (instead of Java 8 targeting Java 3). From 437130a7467a16032931c4a2aa4b28e17bd7d49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 3 Jul 2021 01:46:19 +0200 Subject: [PATCH 18/18] Orphaned for 6+ weeks --- .gitignore | 2 - ...-FastDateFormat-for-Java-7-behaviour.patch | 71 ------ apache-commons-lang.spec | 206 ------------------ dead.package | 1 + sources | 1 - 5 files changed, 1 insertion(+), 280 deletions(-) delete mode 100644 .gitignore delete mode 100644 0000-Fix-FastDateFormat-for-Java-7-behaviour.patch delete mode 100644 apache-commons-lang.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 86e0788..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -commons-lang-2.5-src.tar.gz -/commons-lang-2.6-src.tar.gz diff --git a/0000-Fix-FastDateFormat-for-Java-7-behaviour.patch b/0000-Fix-FastDateFormat-for-Java-7-behaviour.patch deleted file mode 100644 index 122e56c..0000000 --- a/0000-Fix-FastDateFormat-for-Java-7-behaviour.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6af11cb2cfdf83ce013a531005077259984c55e7 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Wed, 22 Feb 2012 11:21:06 +0100 -Subject: [PATCH] Fix FastDateFormat for Java 7 behaviour - -Backported from 1146138 -See https://issues.apache.org/jira/browse/LANG-719 for more information ---- - .../apache/commons/lang/time/FastDateFormat.java | 14 ++++++++++---- - .../commons/lang/time/FastDateFormatTest.java | 5 +++-- - 2 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/src/main/java/org/apache/commons/lang/time/FastDateFormat.java b/src/main/java/org/apache/commons/lang/time/FastDateFormat.java -index 2ca7e5c..b7e19ec 100644 ---- a/src/main/java/org/apache/commons/lang/time/FastDateFormat.java -+++ b/src/main/java/org/apache/commons/lang/time/FastDateFormat.java -@@ -49,7 +49,7 @@ import org.apache.commons.lang.text.StrBuilder; - *

- * - *

Only formatting is supported, but all patterns are compatible with -- * SimpleDateFormat (except time zones - see below).

-+ * SimpleDateFormat (except time zones and some year patterns - see below).

- * - *

Java 1.4 introduced a new pattern letter, 'Z', to represent - * time zones in RFC822 format (eg. +0800 or -1100). -@@ -60,6 +60,12 @@ import org.apache.commons.lang.text.StrBuilder; - * This introduces a minor incompatibility with Java 1.4, but at a gain of - * useful functionality.

- * -+ *

Javadoc cites for the year pattern: For formatting, if the number of -+ * pattern letters is 2, the year is truncated to 2 digits; otherwise it is -+ * interpreted as a number. Starting with Java 1.7 a pattern of 'Y' or -+ * 'YYY' will be formatted as '2003', while it was '03' in former Java -+ * versions. FastDateFormat implements the behavior of Java 7.

-+ * - * @author Apache Software Foundation - * @author TeaTrove project - * @author Brian S O'Neill -@@ -606,10 +612,10 @@ public class FastDateFormat extends Format { - rule = new TextField(Calendar.ERA, ERAs); - break; - case 'y': // year (number) -- if (tokenLen >= 4) { -- rule = selectNumberRule(Calendar.YEAR, tokenLen); -- } else { -+ if (tokenLen == 2) { - rule = TwoDigitYearField.INSTANCE; -+ } else { -+ rule = selectNumberRule(Calendar.YEAR, tokenLen < 4 ? 4 : tokenLen); - } - break; - case 'M': // month in year (text and number) -diff --git a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java -index 8232747..bd4d664 100644 ---- a/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java -+++ b/src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java -@@ -230,8 +230,9 @@ public class FastDateFormatTest extends TestCase { - " dddd ddd dd d DDDD DDD DD D EEEE EEE EE E aaaa aaa aa a zzzz zzz zz z"; - fdf = FastDateFormat.getInstance(pattern); - sdf = new SimpleDateFormat(pattern); -- assertEquals(sdf.format(date1), fdf.format(date1)); -- assertEquals(sdf.format(date2), fdf.format(date2)); -+ // SDF bug fix starting with Java 7 -+ assertEquals(sdf.format(date1).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date1)); -+ assertEquals(sdf.format(date2).replaceAll("2003 03 03 03", "2003 2003 03 2003"), fdf.format(date2)); - - } finally { - Locale.setDefault(realDefaultLocale); --- -1.7.7.6 - diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec deleted file mode 100644 index df5163b..0000000 --- a/apache-commons-lang.spec +++ /dev/null @@ -1,206 +0,0 @@ -%global base_name lang -%global short_name commons-%{base_name} - -Name: apache-%{short_name} -Version: 2.6 -Release: 33%{?dist} -Summary: Provides a host of helper utilities for the java.lang API -License: ASL 2.0 - -URL: https://commons.apache.org/%{base_name} -Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -Patch0: 0000-Fix-FastDateFormat-for-Java-7-behaviour.patch - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: apache-commons-parent -BuildRequires: maven-surefire-provider-junit - -%description -The standard Java libraries fail to provide enough methods for -manipulation of its core classes. The Commons Lang Component provides -these extra methods. -The Commons Lang Component provides a host of helper utilities for the -java.lang API, notably String manipulation methods, basic numerical -methods, object reflection, creation and serialization, and System -properties. Additionally it contains an inheritable enum type, an -exception structure that supports multiple types of nested-Exceptions -and a series of utilities dedicated to help with building methods, such -as hashCode, toString and equals. - -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - -%prep -%setup -q -n %{short_name}-%{version}-src -%patch0 -p1 - -sed -i 's/\r//' *.txt *.html - -%mvn_file : %{name} %{short_name} -%mvn_alias : org.apache.commons: %{base_name}:%{base_name} - -# remove org.apache.commons.lang.enum package -# "enum" is a keyword since Java 4 and cannot be used as an identifier -rm -r src/main/java/org/apache/commons/lang/enum/ -rm -r src/test/java/org/apache/commons/lang/enum/ -rm src/test/java/org/apache/commons/lang/enums/EnumTest.java - -# convert some stray ISO-8859-1 characters to UTF-8 -iconv -f ISO-8859-1 -t UTF-8 \ - src/main/java/org/apache/commons/lang/Entities.java > \ - src/main/java/org/apache/commons/lang/Entities.java.utf-8 -mv src/main/java/org/apache/commons/lang/Entities.java.utf-8 \ - src/main/java/org/apache/commons/lang/Entities.java - -%build -%mvn_build -- \ - -Dcommons.osgi.symbolicName=org.apache.commons.lang \ - -Dmaven.compiler.source=1.8 \ - -Dmaven.compiler.target=1.8 \ - -Dsource=1.8 - -%install -%mvn_install - -%files -f .mfiles -%doc PROPOSAL.html RELEASE-NOTES.txt -%license LICENSE.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - -%changelog -* Tue Jan 26 2021 Fedora Release Engineering - 2.6-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 15 2020 Fabio Valentini - 2.6-32 -- Remove unused org.apache.commons.lang.enum package. -- Compile with Java 11, target Java 8 (instead of Java 8 targeting Java 3). -- Remove stray encoding issues, convert to UTF-8. - -* Mon Jul 27 2020 Fedora Release Engineering - 2.6-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 2.6-30 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jul 09 2020 Mat Booth - 2.6-29 -- Pass javadoc source parameter as a property so it can be used by the xmvn - javadoc mojo - -* Thu Jun 25 2020 Roland Grunberg - 2.6-28 -- Force Java 8 as we cannot build for Java 11 without breaking API. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.6-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Fabio Valentini - 2.6-26 -- Use override for maven compiler source and target that works with xmvn 3.1.0. - -* Wed Jul 24 2019 Fedora Release Engineering - 2.6-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Feb 07 2019 Mat Booth - 2.6-24 -- Rebuild to regenerate OSGi metadata - -* Thu Jan 31 2019 Fedora Release Engineering - 2.6-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.6-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.6-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Alexander Kurtakov 2.6-15 -- Drop old jakarta provides/obsoletes. - -* Tue Mar 04 2014 Stanislav Ochotnicky - 2.6-14 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 2.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 22 2013 Michal Srb - 2.6-12 -- Rebuild - -* Tue Apr 09 2013 Michal Srb - 2.6-11 -- Properly specify XMvn's compilerSource option - -* Wed Feb 13 2013 Fedora Release Engineering - 2.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 2.6-9 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Fri Jan 11 2013 Mikolaj Izdebski - 2.6-8 -- Build with xmvn - -* Wed Jul 18 2012 Fedora Release Engineering - 2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Feb 22 2012 Stanislav Ochotnicky - 2.6-6 -- Add backported fix for JDK 1.7 - -* Thu Jan 12 2012 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Jun 27 2011 Stanislav Ochotnicky - 2.6-4 -- Use new add_maven_depmap macro -- Fix maven3 build - -* Mon Feb 07 2011 Fedora Release Engineering - 2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Stanislav Ochotnicky - 2.6-2 -- Fix commons-lang symlink - -* Tue Jan 18 2011 Stanislav Ochotnicky - 2.6-1 -- Update to 2.6 -- Versionless jars & javadocs -- Use maven 3 to build - -* Wed Nov 10 2010 Stanislav Ochotnicky - 2.5-7 -- Use apache-commons-parent instead of maven-* - -* Thu Jul 8 2010 Stanislav Ochotnicky - 2.5-6 -- Add license to javadoc subpackage - -* Wed May 26 2010 Stanislav Ochotnicky - 2.5-5 -- Add another old depmap to prevent groupId dependency problems - -* Fri May 21 2010 Stanislav Ochotnicky - 2.5-4 -- Correct depmap filename for backward compatibility - -* Mon May 17 2010 Stanislav Ochotnicky - 2.5-3 -- Fix maven depmap JPP name to short_name - -* Mon May 10 2010 Stanislav Ochotnicky - 2.5-2 -- Added export for MAVEN_LOCAL_REPO and mkdir -- Added more add_to_maven_depmap to assure backward compatibility -- Add symlink to short_name.jar - -* Mon May 10 2010 Stanislav Ochotnicky - 2.5-1 -- Rename and rebase of jakarta-commons-lang -- Re-did whole spec file to use maven, dropped gcj support diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 32fef78..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -37ee469f4caff6cfa28f9d0a0be2d4d2 commons-lang-2.6-src.tar.gz