From e87a95d8b62b6cdd984a660a4ce90271b40debd5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 19:15:46 +0200 Subject: [PATCH 01/14] Update to upstream version 1.12 --- apache-commons-codec.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 3f0958d..060b568 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,6 +1,6 @@ Name: apache-commons-codec -Version: 1.11 -Release: 3%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ @@ -41,6 +41,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Mon May 13 2019 Mikolaj Izdebski - 1.12-1 +- Update to upstream version 1.12 + * Wed Feb 07 2018 Fedora Release Engineering - 1.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 80f318d..1216752 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-codec-1.11-src.tar.gz) = b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f +SHA512 (commons-codec-1.12-src.tar.gz) = 1430adcba195e903baa2ce4ed9eafb3ccbffeeae00434bcac8f8f0e2af84bdcd74e017f20a44dc309ac17a8dd15b4e18f759d677edfe42c720102502f19c271f From ba76154a7eac84d08179f19899ce913d1f419f8b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:15 +0200 Subject: [PATCH 02/14] Mass rebuild for javapackages-tools 201901 --- apache-commons-codec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 060b568..85b3a2b 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,6 +1,6 @@ Name: apache-commons-codec Version: 1.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ @@ -41,6 +41,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.12-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 1.12-1 - Update to upstream version 1.12 From 12f3c91e7940f00ef80e50e453f525b031ec824e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:52:46 +0200 Subject: [PATCH 03/14] Declare module package --- apache-commons-codec.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 85b3a2b..5f9b726 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -20,6 +20,7 @@ Commons Codec is an attempt to provide definitive implementations of commonly used encoders and decoders. Examples include Base64, Hex, Phonetic and URLs. +%{?module_package} %{?javadoc_package} %prep @@ -36,7 +37,7 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt aspell-mail.txt %doc RELEASE-NOTES* From e1fcab159058cea3a8c840d5baf80c6cbd267605 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:14:42 +0200 Subject: [PATCH 04/14] Use standard artifact installation location --- apache-commons-codec.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 5f9b726..2a967fd 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -28,7 +28,6 @@ Phonetic and URLs. cp %{SOURCE1} aspell-mail.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt -%mvn_file : commons-codec %{name} %mvn_alias : commons-codec:commons-codec %build From 02945bf041e9df0c4099c7f3cd28a9c9ea780b20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:36:09 +0200 Subject: [PATCH 05/14] Revert "Use standard artifact installation location" This reverts commit e1fcab159058cea3a8c840d5baf80c6cbd267605. --- apache-commons-codec.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 2a967fd..5f9b726 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -28,6 +28,7 @@ Phonetic and URLs. cp %{SOURCE1} aspell-mail.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt +%mvn_file : commons-codec %{name} %mvn_alias : commons-codec:commons-codec %build From c05ce35d90b9e8fd9b643990e0f7537b5873d7a1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 29 Jul 2019 15:38:55 +0200 Subject: [PATCH 06/14] Update to upstream version 1.13 --- apache-commons-codec.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 5f9b726..aae3110 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,6 +1,6 @@ Name: apache-commons-codec -Version: 1.12 -Release: 2%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ @@ -42,6 +42,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Mon Jul 29 2019 Marian Koncek - 1.13-1 +- Update to upstream version 1.13 + * Fri May 24 2019 Mikolaj Izdebski - 1.12-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 1216752..1eb71af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-codec-1.12-src.tar.gz) = 1430adcba195e903baa2ce4ed9eafb3ccbffeeae00434bcac8f8f0e2af84bdcd74e017f20a44dc309ac17a8dd15b4e18f759d677edfe42c720102502f19c271f +SHA512 (commons-codec-1.13-src.tar.gz) = ffe1605ff2d094bc5d95d83f0871cef13866bf05bdfc32e05b1d20bdbc2002377f3bf8571aa0ad3c7a9936e18f8ccdc62a13c2ebd67baf07a5f04811d4c495fb From c109c9cf8900f10a3d973a5de2b8bdbf0b1c2270 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 31 Oct 2019 13:14:04 +0100 Subject: [PATCH 07/14] Fix BuildRequires --- apache-commons-codec.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index aae3110..f068313 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -12,8 +12,9 @@ Source0: http://archive.apache.org/dist/commons/codec/source/commons-code Source1: aspell-mail.txt BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) %description Commons Codec is an attempt to provide definitive implementations of From d423c09b17a5c3a56e50b9db23135cbb377abebf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 08/14] Mass rebuild for javapackages-tools 201902 --- apache-commons-codec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index f068313..ef3a340 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,6 +1,6 @@ Name: apache-commons-codec Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ @@ -43,6 +43,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.13-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Jul 29 2019 Marian Koncek - 1.13-1 - Update to upstream version 1.13 From 76d4c6886950f3e9a4b94192654ea08a4aff51cf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 Dec 2019 09:37:02 +0100 Subject: [PATCH 09/14] Fix OSGi bundle symbolic name --- apache-commons-codec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index ef3a340..0d5adb7 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -33,7 +33,7 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %mvn_alias : commons-codec:commons-codec %build -%mvn_build +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.codec %install %mvn_install From dd3b4adee6ee46cf7638f6adc220d0001d9784d3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 22 Jan 2020 10:23:56 +0100 Subject: [PATCH 10/14] Update to upstream version 1.14 --- apache-commons-codec.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 0d5adb7..a53b0bc 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,12 +1,12 @@ Name: apache-commons-codec -Version: 1.13 -Release: 2%{?dist} +Version: 1.14 +Release: 1%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz # Data in DoubleMetaphoneTest.java originally has an inadmissible license. # The author gives MIT in e-mail communication. Source1: aspell-mail.txt @@ -43,6 +43,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Wed Jan 22 2020 Marian Koncek - 1.14-1 +- Update to upstream version 1.14 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.13-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 1eb71af..aa9504a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-codec-1.13-src.tar.gz) = ffe1605ff2d094bc5d95d83f0871cef13866bf05bdfc32e05b1d20bdbc2002377f3bf8571aa0ad3c7a9936e18f8ccdc62a13c2ebd67baf07a5f04811d4c495fb +SHA512 (commons-codec-1.14-src.tar.gz) = 1a98dc017d3213d8a89d11524683d45e9616fc6da8b4723cd1cfae23d73fefafeccc1c0f2994d1c4c52d79e1b825e4e09e601071572e2eb229105b3b4fd4a49b From bee1dc23a836b10b6d5f26a5cc4e4e0d46da9164 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 11/14] Build with OpenJDK 8 --- apache-commons-codec.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index a53b0bc..22f64d0 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,6 +1,6 @@ Name: apache-commons-codec Version: 1.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 URL: http://commons.apache.org/codec/ @@ -11,7 +11,7 @@ Source0: https://archive.apache.org/dist/commons/codec/source/commons-cod # The author gives MIT in e-mail communication. Source1: aspell-mail.txt -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -43,6 +43,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.14-2 +- Build with OpenJDK 8 + * Wed Jan 22 2020 Marian Koncek - 1.14-1 - Update to upstream version 1.14 From 5f83ed017288f3c5e55f158ab6fb7a5c4da05da5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 11:52:29 +0200 Subject: [PATCH 12/14] Remove bogus alias --- apache-commons-codec.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 22f64d0..453533c 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -30,7 +30,6 @@ cp %{SOURCE1} aspell-mail.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %mvn_file : commons-codec %{name} -%mvn_alias : commons-codec:commons-codec %build %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.codec From f547b7eccf2cafbd696e2474624e8ee5ea341a45 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 10:41:03 +0200 Subject: [PATCH 13/14] Update to upstream version 1.15 --- apache-commons-codec.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 453533c..e0fd896 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,9 +1,9 @@ Name: apache-commons-codec -Version: 1.14 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Implementations of common encoders and decoders License: ASL 2.0 -URL: http://commons.apache.org/codec/ +URL: https://commons.apache.org/codec/ BuildArch: noarch Source0: https://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz @@ -42,6 +42,9 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %doc RELEASE-NOTES* %changelog +* Fri Sep 11 2020 Marian Koncek - 1.15-1 +- Update to upstream version 1.15 + * Sat Jan 25 2020 Mikolaj Izdebski - 1.14-2 - Build with OpenJDK 8 diff --git a/sources b/sources index aa9504a..3a7a1a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-codec-1.14-src.tar.gz) = 1a98dc017d3213d8a89d11524683d45e9616fc6da8b4723cd1cfae23d73fefafeccc1c0f2994d1c4c52d79e1b825e4e09e601071572e2eb229105b3b4fd4a49b +SHA512 (commons-codec-1.15-src.tar.gz) = dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce From b23c06603112992b7dc3145e22e6f65fb796b334 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 14/14] Conditionalize buildrequires in bootstrap mode --- apache-commons-codec.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index e0fd896..4a8bb78 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-codec Version: 1.15 Release: 1%{?dist} @@ -12,9 +14,13 @@ Source0: https://archive.apache.org/dist/commons/codec/source/commons-cod Source1: aspell-mail.txt BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +%endif %description Commons Codec is an attempt to provide definitive implementations of