From 54c80843dbe012263e22dc40b62962b37dc24f15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 16:35:48 +0200 Subject: [PATCH 01/55] Remove build-dependency on powermock --- apache-commons-compress.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 7965d25..6466556 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -20,9 +20,8 @@ BuildRequires: mvn(junit:junit) 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) +BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:org.osgi.core) -BuildRequires: mvn(org.powermock:powermock-api-mockito) -BuildRequires: mvn(org.powermock:powermock-module-junit4) BuildRequires: mvn(org.tukaani:xz) %description @@ -61,6 +60,10 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas %pom_remove_dep :slf4j-api::test rm src/test/java/org/apache/commons/compress/OsgiITest.java +# Remove test that requires powermock +%pom_remove_dep org.powermock: +%pom_add_dep org.mockito:mockito-core::test +rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java %build %mvn_file : %{short_name} %{name} @@ -77,6 +80,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.18-5 +- Remove build-dependency on powermock + * Thu Feb 14 2019 Mat Booth - 1.18-4 - Rebuild to regenerate OSGi metadata From e896ba0872bc4082824e5a10eeebc31ad631c079 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:16 +0200 Subject: [PATCH 02/55] Mass rebuild for javapackages-tools 201901 --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 6466556..52e3877 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -80,6 +80,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.18-6 +- Mass rebuild for javapackages-tools 201901 + * Fri May 24 2019 Mikolaj Izdebski - 1.18-5 - Remove build-dependency on powermock From 2cf6e32e0d6278b8b2dbd4cb95fdbffac2b2b1df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 10:55:15 +0200 Subject: [PATCH 03/55] Use en_US.UTF-8 locale on RHEL 7 --- apache-commons-compress.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 52e3877..17efe3d 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -68,6 +68,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %build %mvn_file : %{short_name} %{name} %mvn_alias : commons: +%if 0%{?rhel} && 0%{?rhel} <= 7 +export LC_ALL=en_US.UTF-8 +%endif %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.compress %install From b64313bf22cee6f47bdf827cdc47b60a3f2ebef5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 2 Sep 2019 08:56:58 +0200 Subject: [PATCH 04/55] Update to upstream version 1.19 --- .gitignore | 1 + apache-commons-compress.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0ed13ff..1c9c7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ commons-compress-1.0-src.tar.gz /commons-compress-1.15-src.tar.gz /commons-compress-1.16.1-src.tar.gz /commons-compress-1.17-src.tar.gz +/commons-compress-1.19-src.tar.gz diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 17efe3d..aa5b7e9 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,15 +1,12 @@ -%global base_name compress -%global short_name commons-%{base_name} - -Name: apache-%{short_name} -Version: 1.18 -Release: 6%{?dist} +Name: apache-commons-compress +Version: 1.19 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz +Source0: http://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch @@ -37,7 +34,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-compress-%{version}-src # Unavailable Google Brotli library (org.brotli.dec) %patch0 -p1 @@ -66,7 +63,7 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java %build -%mvn_file : %{short_name} %{name} +%mvn_file : commons-compress %{name} %mvn_alias : commons: %if 0%{?rhel} && 0%{?rhel} <= 7 export LC_ALL=en_US.UTF-8 @@ -83,6 +80,9 @@ export LC_ALL=en_US.UTF-8 %doc LICENSE.txt NOTICE.txt %changelog +* Mon Sep 02 2019 Marian Koncek - 1.19-1 +- Update to upstream version 1.19 + * Fri May 24 2019 Mikolaj Izdebski - 1.18-6 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index dac24ab..eed6188 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.18-src.tar.gz) = e601e150e58ee453991789e0e58337e71725210fc798d77954ce525ba6fd3312a3b0174aba9f4bfbe7c6bac806a29247ad6a31eca8bd540c6f850777bf8a926d +SHA512 (commons-compress-1.19-src.tar.gz) = 9c3c1152ea7419a2e5c398a1d9becfcb807708ed9dccda94e2c19666269d4d2d89c14fb329484a4668b002d3d2c02ca6cd3012b3144f7221c6969201a96c0c8f From d2b9a6cc0c1f50049aa915cc2a1925888e70297d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 05/55] Mass rebuild for javapackages-tools 201902 --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index aa5b7e9..c3b9c5d 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,6 +1,6 @@ Name: apache-commons-compress Version: 1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -80,6 +80,9 @@ export LC_ALL=en_US.UTF-8 %doc LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.19-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Sep 02 2019 Marian Koncek - 1.19-1 - Update to upstream version 1.19 From d92373bfcd83e8f78bd310651af41c524fee2bd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:43:10 +0000 Subject: [PATCH 06/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 6ad63b8..0c3a768 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -83,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 04 2019 Fabio Valentini - 1.19-1 - Update to version 1.19. From 675d57c9eeb7c07761e9e78a86a30245eab3a7b9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 2 Mar 2020 11:52:28 +0100 Subject: [PATCH 07/55] update to version 1.20 --- .gitignore | 1 + apache-commons-compress.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 979291e..6ab137d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /commons-compress-1.17-src.tar.gz /commons-compress-1.18-src.tar.gz /commons-compress-1.19-src.tar.gz +/commons-compress-1.20-src.tar.gz diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 0c3a768..c5d8dbb 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.19 -Release: 2%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -83,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Mon Mar 02 2020 Fabio Valentini - 1.20-1 +- Update to version 1.20. + * Tue Jan 28 2020 Fedora Release Engineering - 1.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index eed6188..131952c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.19-src.tar.gz) = 9c3c1152ea7419a2e5c398a1d9becfcb807708ed9dccda94e2c19666269d4d2d89c14fb329484a4668b002d3d2c02ca6cd3012b3144f7221c6969201a96c0c8f +SHA512 (commons-compress-1.20-src.tar.gz) = 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e From 45de21f4327f7b84bec828d30cec3b2474b74151 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Mar 2020 09:30:16 +0100 Subject: [PATCH 08/55] Update to upstream version 1.20 --- .gitignore | 1 + apache-commons-compress.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9c7a2..4264390 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ commons-compress-1.0-src.tar.gz /commons-compress-1.16.1-src.tar.gz /commons-compress-1.17-src.tar.gz /commons-compress-1.19-src.tar.gz +/commons-compress-1.20-src.tar.gz diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index c3b9c5d..659afbe 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,12 +1,12 @@ Name: apache-commons-compress -Version: 1.19 -Release: 2%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 -URL: http://commons.apache.org/proper/commons-compress/ +URL: https://commons.apache.org/proper/commons-compress/ BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch @@ -80,6 +80,9 @@ export LC_ALL=en_US.UTF-8 %doc LICENSE.txt NOTICE.txt %changelog +* Wed Mar 04 2020 Marian Koncek - 1.20-1 +- Update to upstream version 1.20 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.19-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index eed6188..131952c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.19-src.tar.gz) = 9c3c1152ea7419a2e5c398a1d9becfcb807708ed9dccda94e2c19666269d4d2d89c14fb329484a4668b002d3d2c02ca6cd3012b3144f7221c6969201a96c0c8f +SHA512 (commons-compress-1.20-src.tar.gz) = 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e From b952a34d82999370185d9bb879441f9e4be7e530 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:20:03 +0200 Subject: [PATCH 09/55] Rebuilt for JDK-11 --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index c5d8dbb..faf2f3e 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -83,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1.20-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Mar 02 2020 Fabio Valentini - 1.20-1 - Update to version 1.20. From 19527f1155934f27376bf503c44bb3e71190cfbb Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 16 Jul 2020 11:24:42 +0100 Subject: [PATCH 10/55] Ensure Java 8 level bytecode when built on Java 11 --- apache-commons-compress.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index faf2f3e..2c75438 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -68,6 +68,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java %pom_add_dep org.mockito:mockito-core::test rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java +# Generate Java 8 level bytecode when built on Java 11 +%pom_xpath_replace "pom:maven.compiler.release" "8" + %build %mvn_file : %{short_name} %{name} %mvn_alias : commons: @@ -83,6 +86,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jul 16 2020 Mat Booth - 1.20-3 +- Ensure Java 8 level bytecode when built on Java 11 + * Fri Jul 10 2020 Jiri Vanek - 1.20-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 4faaf5c84434fa03773c0df3fa5d4d011fcb561c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:09:47 +0000 Subject: [PATCH 11/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 2c75438..e89d9ed 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -86,6 +86,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 16 2020 Mat Booth - 1.20-3 - Ensure Java 8 level bytecode when built on Java 11 From 0db2bcd9ddf8a109ef674b3ac17570b0cb429534 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:13:38 +0000 Subject: [PATCH 12/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index e89d9ed..4dd8e67 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -86,6 +86,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7f5162820c3e91faee939834e9bfeaec4716ffbc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 13/55] Conditionalize buildrequires in bootstrap mode --- apache-commons-compress.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 659afbe..439963d 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-compress Version: 1.20 Release: 1%{?dist} @@ -13,6 +15,9 @@ Patch1: 0002-Remove-ZSTD-compressor.patch Patch2: 0003-Avoid-use-of-internal-Mockito-API.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -20,6 +25,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.tukaani:xz) +%endif %description The Apache Commons Compress library defines an API for working with From 394e33d8b6e25dfe933b76b3151c9b6ec1c8a6f0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 14/55] Turn off bootstrap mode by default --- apache-commons-compress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index bc4b9fd..c2b5bff 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-compress Version: 1.20 From df631ac4b941ed148d92afff76782091d259d87e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:26 +0200 Subject: [PATCH 15/55] Bootstrap build --- apache-commons-compress.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index c2b5bff..789980f 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-compress Version: 1.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -83,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.20-6 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7be5c4d5f706e12212450b1761941be5607e88df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:41 +0200 Subject: [PATCH 16/55] Non-bootstrap build --- apache-commons-compress.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 789980f..578e3b8 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-compress Version: 1.20 @@ -85,6 +85,7 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %changelog * Mon May 17 2021 Mikolaj Izdebski - 1.20-6 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ab6318b807c7a0ac5ee461859e348b34507480fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:46:25 +0000 Subject: [PATCH 17/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 52ad07d3af209672f054be49c159bf35950e1817 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:42:24 +0000 Subject: [PATCH 18/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 578e3b8..0e5bbf9 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -83,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1.20-6 - Bootstrap build - Non-bootstrap build From f4ab0b6b8085b0b49f7f0ad54f0ec1fd8f2eedda Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 6 Aug 2021 15:09:23 +0200 Subject: [PATCH 19/55] Update to upstream version 1.21 --- .gitignore | 1 + 0001-Remove-Brotli-compressor.patch | 4 +- 0002-Remove-ZSTD-compressor.patch | 8 +-- 0003-Avoid-use-of-internal-Mockito-API.patch | 32 ------------ 0003-Remove-Pack200-compressor.patch | 54 ++++++++++++++++++++ apache-commons-compress.spec | 26 +++++++--- sources | 2 +- 7 files changed, 80 insertions(+), 47 deletions(-) delete mode 100644 0003-Avoid-use-of-internal-Mockito-API.patch create mode 100644 0003-Remove-Pack200-compressor.patch diff --git a/.gitignore b/.gitignore index 6ab137d..5c2bbcb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /commons-compress-1.18-src.tar.gz /commons-compress-1.19-src.tar.gz /commons-compress-1.20-src.tar.gz +/commons-compress-1.21-src.tar.gz diff --git a/0001-Remove-Brotli-compressor.patch b/0001-Remove-Brotli-compressor.patch index cb3ba5b..2cb97b9 100644 --- a/0001-Remove-Brotli-compressor.patch +++ b/0001-Remove-Brotli-compressor.patch @@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Remove Brotli compressor 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index d730b9d..ab178a9 100644 +index db0d305..0f1394f 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java @@ -31,8 +31,6 @@ import java.util.Set; @@ -20,7 +20,7 @@ index d730b9d..ab178a9 100644 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; -@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -579,10 +577,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (BROTLI.equalsIgnoreCase(name)) { diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index de8a529..e6dc71d 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Remove ZSTD compressor 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index ab178a9..3817704 100644 +index 0f1394f..eee7c31 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java @@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; @@ -21,7 +21,7 @@ index ab178a9..3817704 100644 import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.ServiceLoaderIterator; -@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -509,10 +506,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { return LZ4_FRAMED; } @@ -32,7 +32,7 @@ index ab178a9..3817704 100644 throw new CompressorException("No Compressor found for the stream signature."); } /** -@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -588,10 +581,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -44,7 +44,7 @@ index ab178a9..3817704 100644 } if (LZMA.equalsIgnoreCase(name)) { -@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -707,7 +697,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { diff --git a/0003-Avoid-use-of-internal-Mockito-API.patch b/0003-Avoid-use-of-internal-Mockito-API.patch deleted file mode 100644 index a63e95f..0000000 --- a/0003-Avoid-use-of-internal-Mockito-API.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4dd332d8f82d3a5f0ac6654d2c1733e44da6ddbd Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Thu, 7 Feb 2019 14:57:25 +0000 -Subject: [PATCH 3/3] Avoid use of internal Mockito API - ---- - .../compress/utils/FixedLengthBlockOutputStreamTest.java | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -index cfda61b..e94ccee 100644 ---- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -@@ -39,7 +39,6 @@ import java.nio.file.Path; - import java.util.concurrent.atomic.AtomicBoolean; - import org.hamcrest.core.IsInstanceOf; - import org.junit.Test; --import org.mockito.internal.matchers.GreaterOrEqual; - - public class FixedLengthBlockOutputStreamTest { - -@@ -294,7 +293,6 @@ public class FixedLengthBlockOutputStreamTest { - - private static void assertContainsAtOffset(String msg, byte[] expected, int offset, - byte[] actual) { -- assertThat(actual.length, new GreaterOrEqual<>(offset + expected.length)); - for (int i = 0; i < expected.length; i++) { - assertEquals(String.format("%s ([%d])", msg, i), expected[i], actual[i + offset]); - } --- -2.20.1 - diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch new file mode 100644 index 0000000..5aa1b14 --- /dev/null +++ b/0003-Remove-Pack200-compressor.patch @@ -0,0 +1,54 @@ +From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 6 Aug 2021 13:42:40 +0200 +Subject: [PATCH] Remove Pack200 compressor + +--- + .../compress/compressors/CompressorStreamFactory.java | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +index eee7c31..de7da23 100644 +--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java ++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +@@ -45,8 +45,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre + import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; + import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; + import org.apache.commons.compress.compressors.lzma.LZMAUtils; +-import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream; +-import org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream; + import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; + import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; + import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; +@@ -478,10 +476,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return GZIP; + } + +- if (Pack200CompressorInputStream.matches(signature, signatureLength)) { +- return PACK200; +- } +- + if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { + return SNAPPY_FRAMED; + } +@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + } + + if (PACK200.equalsIgnoreCase(name)) { +- return new Pack200CompressorInputStream(in); ++ throw new CompressorException("Pack200 compression is not available in this build."); + } + + if (SNAPPY_RAW.equalsIgnoreCase(name)) { +@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + } + + if (PACK200.equalsIgnoreCase(name)) { +- return new Pack200CompressorOutputStream(out); ++ throw new CompressorException("Pack200 compression is not available in this build."); + } + + if (LZMA.equalsIgnoreCase(name)) { +-- +2.31.1 + diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 0e5bbf9..e3dbbcb 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-commons-compress -Version: 1.20 -Release: 7%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -12,7 +12,7 @@ Source0: https://archive.apache.org/dist/commons/compress/source/commons- Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch -Patch2: 0003-Avoid-use-of-internal-Mockito-API.patch +Patch2: 0003-Remove-Pack200-compressor.patch BuildRequires: maven-local %if %{with bootstrap} @@ -22,6 +22,7 @@ BuildRequires: mvn(junit:junit) 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) +BuildRequires: mvn(org.hamcrest:hamcrest) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.tukaani:xz) @@ -53,8 +54,15 @@ rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java -# Avoid using internal Mockito APIs +# Remove support for pack200 which depends on ancient asm:asm:3.2 %patch2 -p1 +%pom_remove_dep asm:asm +rm -r src/{main,test}/java/org/apache/commons/compress/harmony +rm -r src/main/java/org/apache/commons/compress/compressors/pack200 +rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java +rm src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java +rm -r src/test/java/org/apache/commons/compress/compressors/pack200 +rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java # remove osgi tests, we don't have deps for them %pom_remove_dep org.ops4j.pax.exam:::test @@ -63,10 +71,9 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas %pom_remove_dep :slf4j-api::test rm src/test/java/org/apache/commons/compress/OsgiITest.java -# Remove test that requires powermock -%pom_remove_dep org.powermock: -%pom_add_dep org.mockito:mockito-core::test -rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java +# Not packaged +%pom_remove_dep com.github.marschall:memoryfilesystem +rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java %build %mvn_file : commons-compress %{name} @@ -83,6 +90,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea %doc LICENSE.txt NOTICE.txt %changelog +* Fri Aug 06 2021 Marian Koncek - 1.21-1 +- Update to upstream version 1.21 + * Wed Jul 21 2021 Fedora Release Engineering - 1.20-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 131952c..9b0a038 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.20-src.tar.gz) = 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e +SHA512 (commons-compress-1.21-src.tar.gz) = 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1 From 199856792fcd2d02dfc306de89062d9af70c4ec5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:24:22 +0000 Subject: [PATCH 20/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index e3dbbcb..2eae507 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -90,6 +90,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Marian Koncek - 1.21-1 - Update to upstream version 1.21 From addc319f13e8cb119b3e1e1f8fa4813275384b1a Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:23:59 +0100 Subject: [PATCH 21/55] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 2eae507..fcec73b 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -90,6 +90,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.21-3 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bad74f7c9dc8621bf1dca8f3ceec12ff1a04e57a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:23 +0200 Subject: [PATCH 22/55] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-compress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index fcec73b..59f8315 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -7,6 +7,7 @@ Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz From f3bbd774e8227b81faca89d839e891a6f22be926 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 23/55] Update build-requires in bootstrap mode --- apache-commons-compress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 59f8315..1baa40e 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -15,10 +15,10 @@ Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch Patch2: 0003-Remove-Pack200-compressor.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From bb24248b7ae8a9a7e1faf3642d988b056b72d541 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:59:00 +0000 Subject: [PATCH 24/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 1baa40e..0582fcf 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -91,6 +91,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.21-3 - Rebuilt for java-17-openjdk as system jdk From d9cccd211689050d2a5d98a0c69afcce1428b04a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 25/55] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From d12c3bf6f579dae21a2c375c8ed114179a580f52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:53:47 +0000 Subject: [PATCH 26/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 0582fcf..fb17f82 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -91,6 +91,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 83dc0bfb34d2dcfa0ab06068691e400fff8f71b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:28:00 +0000 Subject: [PATCH 27/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index fb17f82..ab98ea6 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.21 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -91,6 +91,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.21-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 086c31159120e38282be64713ed898b02c9c4e45 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 10 Aug 2023 14:39:27 +0200 Subject: [PATCH 28/55] Skip tests for now --- apache-commons-compress.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index ab98ea6..4c91c0c 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -79,7 +79,8 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %build %mvn_file : commons-compress %{name} %mvn_alias : commons: -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.compress +# XXX failing tests, need to investigate why +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.compress %install %mvn_install From 34378a26353583f179c213fb68ea11e75b8e1524 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:30 +0200 Subject: [PATCH 29/55] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- apache-commons-compress.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 4c91c0c..f6d37f2 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,9 +2,9 @@ Name: apache-commons-compress Version: 1.21 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java API for working with compressed files and archivers -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -92,6 +92,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.21-7 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.21-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7d408256b14d532ac5b0784e12e031bd0018d505 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 30/55] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 47315259e66184814c6ccfaa20be13b46461b2a8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 8 Dec 2023 14:27:27 +0100 Subject: [PATCH 31/55] Update to upstream version 1.25.0 --- .gitignore | 1 + 0002-Remove-ZSTD-compressor.patch | 20 ++++++++++---------- 0003-Remove-Pack200-compressor.patch | 22 +++++++++++----------- apache-commons-compress.spec | 26 ++++++++++++-------------- sources | 2 +- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 5c2bbcb..ab4a5c5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /commons-compress-1.19-src.tar.gz /commons-compress-1.20-src.tar.gz /commons-compress-1.21-src.tar.gz +/commons-compress-1.25.0-src.tar.gz diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index e6dc71d..244a153 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -8,10 +8,10 @@ Subject: [PATCH 2/3] Remove ZSTD compressor 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index 0f1394f..eee7c31 100644 +index 95b6e45..16bc88e 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZUtils; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; @@ -19,20 +19,20 @@ index 0f1394f..eee7c31 100644 -import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream; -import org.apache.commons.compress.compressors.zstandard.ZstdUtils; import org.apache.commons.compress.utils.IOUtils; - import org.apache.commons.compress.utils.Lists; - import org.apache.commons.compress.utils.ServiceLoaderIterator; -@@ -509,10 +506,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + import org.apache.commons.compress.utils.Sets; + +@@ -297,10 +294,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { return LZ4_FRAMED; } -- if (ZstdUtils.matches(signature, signatureLength)) { +- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) { - return ZSTANDARD; - } - throw new CompressorException("No Compressor found for the stream signature."); } - /** -@@ -588,10 +581,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + +@@ -615,10 +608,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -44,7 +44,7 @@ index 0f1394f..eee7c31 100644 } if (LZMA.equalsIgnoreCase(name)) { -@@ -707,7 +697,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -734,7 +724,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -54,5 +54,5 @@ index 0f1394f..eee7c31 100644 } catch (final IOException e) { throw new CompressorException("Could not create CompressorOutputStream", e); -- -2.20.1 +2.43.0 diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch index 5aa1b14..64b3079 100644 --- a/0003-Remove-Pack200-compressor.patch +++ b/0003-Remove-Pack200-compressor.patch @@ -1,6 +1,6 @@ -From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001 +From 2db4e6319326e584051ebefd565675356ab0a3cc Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Fri, 6 Aug 2021 13:42:40 +0200 +Date: Fri, 8 Dec 2023 14:18:18 +0100 Subject: [PATCH] Remove Pack200 compressor --- @@ -8,10 +8,10 @@ Subject: [PATCH] Remove Pack200 compressor 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index eee7c31..de7da23 100644 +index 16bc88e..f3c7f3f 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -45,8 +45,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre +@@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; import org.apache.commons.compress.compressors.lzma.LZMAUtils; @@ -20,18 +20,18 @@ index eee7c31..de7da23 100644 import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; -@@ -478,10 +476,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -265,10 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { return GZIP; } -- if (Pack200CompressorInputStream.matches(signature, signatureLength)) { +- if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) { - return PACK200; - } - - if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { + if (compressorNames.contains(SNAPPY_FRAMED) && + FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { return SNAPPY_FRAMED; - } -@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -619,7 +613,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (PACK200.equalsIgnoreCase(name)) { @@ -40,7 +40,7 @@ index eee7c31..de7da23 100644 } if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -700,7 +694,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (PACK200.equalsIgnoreCase(name)) { @@ -50,5 +50,5 @@ index eee7c31..de7da23 100644 if (LZMA.equalsIgnoreCase(name)) { -- -2.31.1 +2.43.0 diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index f6d37f2..467c5ef 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-commons-compress -Version: 1.21 -Release: 7%{?dist} +Version: 1.25.0 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -11,21 +11,19 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz -Patch0: 0001-Remove-Brotli-compressor.patch -Patch1: 0002-Remove-ZSTD-compressor.patch -Patch2: 0003-Remove-Pack200-compressor.patch +Patch1: 0001-Remove-Brotli-compressor.patch +Patch2: 0002-Remove-ZSTD-compressor.patch +Patch3: 0003-Remove-Pack200-compressor.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(junit:junit) 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) -BuildRequires: mvn(org.hamcrest:hamcrest) -BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.tukaani:xz) %endif @@ -45,23 +43,20 @@ This package provides %{summary}. %setup -q -n commons-compress-%{version}-src # Unavailable Google Brotli library (org.brotli.dec) -%patch0 -p1 +%patch 1 -p1 %pom_remove_dep org.brotli:dec rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli # Unavailable ZSTD JNI library -%patch1 -p1 +%patch 2 -p1 %pom_remove_dep :zstd-jni rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard -rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java # Remove support for pack200 which depends on ancient asm:asm:3.2 -%patch2 -p1 -%pom_remove_dep asm:asm +%patch 3 -p1 rm -r src/{main,test}/java/org/apache/commons/compress/harmony rm -r src/main/java/org/apache/commons/compress/compressors/pack200 rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java -rm src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java rm -r src/test/java/org/apache/commons/compress/compressors/pack200 rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java @@ -92,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Fri Dec 08 2023 Marian Koncek - 1.25.0-1 +- Update to upstream version 1.25.0 + * Fri Sep 01 2023 Mikolaj Izdebski - 1.21-7 - Convert License tag to SPDX format diff --git a/sources b/sources index 9b0a038..016e281 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.21-src.tar.gz) = 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1 +SHA512 (commons-compress-1.25.0-src.tar.gz) = 58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a From eac7b2b34fcf6a3e9c66163670c16f6e3ec1fd5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:11:42 +0000 Subject: [PATCH 32/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 467c5ef..0affec1 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 08 2023 Marian Koncek - 1.25.0-1 - Update to upstream version 1.25.0 From dc8b803d9c2842d71fcad2548cfe756ed0839fb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:13:11 +0000 Subject: [PATCH 33/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 0affec1..3f74ebb 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.25.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cd084d70aa8417e606fa34adbf2a35babae743f1 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:14:07 +0100 Subject: [PATCH 34/55] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 3f74ebb..6f80715 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 1.25.0-4 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1.25.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a00edf10bc7080270f15f943cbd26afda39eb33a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:42:08 +0100 Subject: [PATCH 35/55] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 6f80715..89b02bc 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.25.0-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1.25.0-4 - bump of release for for java-21-openjdk as system jdk From e9e7551fa81f9d92d9bc7263572e2b44a51a42f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:10:28 +0000 Subject: [PATCH 36/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-commons-compress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 89b02bc..a6b25eb 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.25.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.25.0-5 - Rebuilt for java-21-openjdk as system jdk From 596f376115f55177e12f43423c3291682bcb40bc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:42:32 +0200 Subject: [PATCH 37/55] Install license files in licensedir instead of docdir --- apache-commons-compress.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index a6b25eb..cffee5d 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -81,12 +81,15 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 1.25.0-7 +- Install license files in licensedir instead of docdir + * Wed Jul 17 2024 Fedora Release Engineering - 1.25.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4b10704abf8e5c4b89f2c3c222874dfd7859225b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 38/55] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 53ad75f6503f43330112a4f40ff38193a1cba12c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 39/55] Switch from %setup to %autosetup --- apache-commons-compress.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index cffee5d..9858368 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -40,20 +40,17 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n commons-compress-%{version}-src +%autosetup -p1 -n commons-compress-%{version}-src # Unavailable Google Brotli library (org.brotli.dec) -%patch 1 -p1 %pom_remove_dep org.brotli:dec rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli # Unavailable ZSTD JNI library -%patch 2 -p1 %pom_remove_dep :zstd-jni rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard # Remove support for pack200 which depends on ancient asm:asm:3.2 -%patch 3 -p1 rm -r src/{main,test}/java/org/apache/commons/compress/harmony rm -r src/main/java/org/apache/commons/compress/compressors/pack200 rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java From 139970128c2c3233d3f530b358553c8a7cf8f68b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 40/55] Switch to non-numdered patches --- apache-commons-compress.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 9858368..08365f8 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -11,9 +11,9 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz -Patch1: 0001-Remove-Brotli-compressor.patch -Patch2: 0002-Remove-ZSTD-compressor.patch -Patch3: 0003-Remove-Pack200-compressor.patch +Patch: 0001-Remove-Brotli-compressor.patch +Patch: 0002-Remove-ZSTD-compressor.patch +Patch: 0003-Remove-Pack200-compressor.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 358a15396c0cfe044a714751cae11b7daeec4930 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 41/55] Convert to %autorelease and %autochangelog --- apache-commons-compress.spec | 253 +---------------------------------- changelog | 250 ++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 251 deletions(-) create mode 100644 changelog diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 08365f8..3720e3c 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ Name: apache-commons-compress Version: 1.25.0 -Release: 7%{?dist} +Release: %autorelease Summary: Java API for working with compressed files and archivers License: Apache-2.0 URL: https://commons.apache.org/proper/commons-compress/ @@ -84,253 +84,4 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %license LICENSE.txt NOTICE.txt %changelog -* Wed Jul 24 2024 Mikolaj Izdebski - 1.25.0-7 -- Install license files in licensedir instead of docdir - -* Wed Jul 17 2024 Fedora Release Engineering - 1.25.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.25.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.25.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.25.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 08 2023 Marian Koncek - 1.25.0-1 -- Update to upstream version 1.25.0 - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.21-7 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.21-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.21-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.21-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.21-3 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Aug 06 2021 Marian Koncek - 1.21-1 -- Update to upstream version 1.21 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.20-6 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 16 2020 Mat Booth - 1.20-3 -- Ensure Java 8 level bytecode when built on Java 11 - -* Fri Jul 10 2020 Jiri Vanek - 1.20-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Mar 04 2020 Marian Koncek - 1.20-1 -- Update to upstream version 1.20 - -* Mon Mar 02 2020 Fabio Valentini - 1.20-1 -- Update to version 1.20. - -* Tue Jan 28 2020 Fedora Release Engineering - 1.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.19-2 -- Mass rebuild for javapackages-tools 201902 - -* Fri Oct 04 2019 Fabio Valentini - 1.19-1 -- Update to version 1.19. - -* Wed Sep 18 2019 Fabio Valentini - 1.18-7 -- Migrate from the obsolete felix-osgi-core to osgi-core. - -* Mon Sep 02 2019 Marian Koncek - 1.19-1 -- Update to upstream version 1.19 - -* Wed Aug 14 2019 Fabio Valentini - 1.18-6 -- Remove build-dependency on powermock - -* Wed Jul 24 2019 Fedora Release Engineering - 1.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.18-6 -- Mass rebuild for javapackages-tools 201901 - -* Fri May 24 2019 Mikolaj Izdebski - 1.18-5 -- Remove build-dependency on powermock - -* Thu Feb 14 2019 Mat Booth - 1.18-4 -- Rebuild to regenerate OSGi metadata - -* Thu Feb 07 2019 Mat Booth - 1.18-3 -- Fix test suite build against Mockito 2.x - -* Thu Jan 31 2019 Fedora Release Engineering - 1.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 05 2018 Marian Koncek - 1.18-1 -- Update to upstream version 1.18 -- Resolves: CVE-2018-11771 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Michael Simacek - 1.17-1 -- Update to upstream version 1.17 - -* Mon Feb 12 2018 Michael Simacek - 1.16.1-1 -- Update to upstream version 1.16.1 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Oct 22 2017 Michael Simacek - 1.15-1 -- Update to upstream version 1.15 - -* Wed Jul 26 2017 Fedora Release Engineering - 1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 14 2017 Roman Vais - 1.14-1 -- Update to upstream version 1.14 -- Remove Brotli support, it is not packaged for fedora - -* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 02 2017 Michael Simacek - 1.13-1 -- Update to upstream version 1.13 - -* Wed Jun 22 2016 Michael Simacek - 1.12-1 -- Update to upstream version 1.12 - -* Mon May 02 2016 Michael Simacek - 1.11-1 -- Update to upstream version 1.11 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 -- Update to latest upstream snapshot - -* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 -- Update to upstream version 1.9 - -* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 -- Fix build-requires on apache-commons-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 -- Update to upstream version 1.8.1 - -* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 -- Remove dependency on maven-scm-publish-plugin - -* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 -- Update to upstream version 1.8 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 -- Update to upstream version 1.7 - -* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 -- Update to upstream version 1.6 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 -- Update to upstream version 1.5 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.4.1-5 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jan 9 2013 Mikolaj Izdebski - 1.4.1-4 -- Bump release tag - -* Tue Jan 8 2013 Mikolaj Izdebski - 1.4.1-3 -- Build with xmvn -- Update to current packaging guidelines - -* Wed Jul 18 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Sandro Mathys - 1.4.1-1 -- Updated to 1.4.1 -- Fixes CVE-2012-2098 Low: Denial of Service - -* Fri Apr 27 2012 Sandro Mathys - 1.4-1 -- Updated to 1.4 - -* Thu Jan 12 2012 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 01 2011 Sandro Mathys - 1.3-1 -- Updated to 1.3 - -* Thu Aug 04 2011 Sandro Mathys - 1.2-2 -- Fixing mistake where different versions of the spec file got mixed up - -* Thu Aug 04 2011 Sandro Mathys - 1.2-1 -- Updated to 1.2 - -* Sat Apr 16 2011 Chris Spike 1.1-1 -- Updated to 1.1 -- Adapted to current java packaging guidelines - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 11 2010 Sandro Mathys - 1.0-8 -- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons - -* Mon May 31 2010 Sandro Mathys - 1.0-7 -- Fixed regression with missing Provides/Obsoletes for javadocs -- Fixed changelog format - -* Sun May 23 2010 Sandro Mathys - 1.0-6 -- Fixed Maven depmap to use commons-compress - -* Thu May 13 2010 Sandro Mathys - 1.0-5 -- Added missing Provides/Obsoletes for javadocs - -* Mon May 10 2010 Sandro Mathys - 1.0-4 -- Cleared some problems after the review - -* Thu May 06 2010 Sandro Mathys - 1.0-3 -- Now using maven2 (mvn-jpp) instead of directly calling javac & co - -* Tue May 04 2010 Sandro Mathys - 1.0-2 -- Renamed from jakarta-commons-compress +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2b0d5f7 --- /dev/null +++ b/changelog @@ -0,0 +1,250 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 1.25.0-7 +- Install license files in licensedir instead of docdir + +* Wed Jul 17 2024 Fedora Release Engineering - 1.25.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.25.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.25.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.25.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marian Koncek - 1.25.0-1 +- Update to upstream version 1.25.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.21-7 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.21-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.21-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Aug 06 2021 Marian Koncek - 1.21-1 +- Update to upstream version 1.21 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.20-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Mat Booth - 1.20-3 +- Ensure Java 8 level bytecode when built on Java 11 + +* Fri Jul 10 2020 Jiri Vanek - 1.20-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 1.20-1 +- Update to upstream version 1.20 + +* Mon Mar 02 2020 Fabio Valentini - 1.20-1 +- Update to version 1.20. + +* Tue Jan 28 2020 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.19-2 +- Mass rebuild for javapackages-tools 201902 + +* Fri Oct 04 2019 Fabio Valentini - 1.19-1 +- Update to version 1.19. + +* Wed Sep 18 2019 Fabio Valentini - 1.18-7 +- Migrate from the obsolete felix-osgi-core to osgi-core. + +* Mon Sep 02 2019 Marian Koncek - 1.19-1 +- Update to upstream version 1.19 + +* Wed Aug 14 2019 Fabio Valentini - 1.18-6 +- Remove build-dependency on powermock + +* Wed Jul 24 2019 Fedora Release Engineering - 1.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.18-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri May 24 2019 Mikolaj Izdebski - 1.18-5 +- Remove build-dependency on powermock + +* Thu Feb 14 2019 Mat Booth - 1.18-4 +- Rebuild to regenerate OSGi metadata + +* Thu Feb 07 2019 Mat Booth - 1.18-3 +- Fix test suite build against Mockito 2.x + +* Thu Jan 31 2019 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 05 2018 Marian Koncek - 1.18-1 +- Update to upstream version 1.18 +- Resolves: CVE-2018-11771 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 05 2018 Michael Simacek - 1.17-1 +- Update to upstream version 1.17 + +* Mon Feb 12 2018 Michael Simacek - 1.16.1-1 +- Update to upstream version 1.16.1 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Oct 22 2017 Michael Simacek - 1.15-1 +- Update to upstream version 1.15 + +* Wed Jul 26 2017 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 14 2017 Roman Vais - 1.14-1 +- Update to upstream version 1.14 +- Remove Brotli support, it is not packaged for fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Michael Simacek - 1.13-1 +- Update to upstream version 1.13 + +* Wed Jun 22 2016 Michael Simacek - 1.12-1 +- Update to upstream version 1.12 + +* Mon May 02 2016 Michael Simacek - 1.11-1 +- Update to upstream version 1.11 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 +- Update to latest upstream snapshot + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 +- Fix build-requires on apache-commons-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + +* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 +- Remove dependency on maven-scm-publish-plugin + +* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 +- Update to upstream version 1.8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 +- Update to upstream version 1.7 + +* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.4.1-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 1.4.1-4 +- Bump release tag + +* Tue Jan 8 2013 Mikolaj Izdebski - 1.4.1-3 +- Build with xmvn +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 24 2012 Sandro Mathys - 1.4.1-1 +- Updated to 1.4.1 +- Fixes CVE-2012-2098 Low: Denial of Service + +* Fri Apr 27 2012 Sandro Mathys - 1.4-1 +- Updated to 1.4 + +* Thu Jan 12 2012 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 01 2011 Sandro Mathys - 1.3-1 +- Updated to 1.3 + +* Thu Aug 04 2011 Sandro Mathys - 1.2-2 +- Fixing mistake where different versions of the spec file got mixed up + +* Thu Aug 04 2011 Sandro Mathys - 1.2-1 +- Updated to 1.2 + +* Sat Apr 16 2011 Chris Spike 1.1-1 +- Updated to 1.1 +- Adapted to current java packaging guidelines + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 11 2010 Sandro Mathys - 1.0-8 +- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons + +* Mon May 31 2010 Sandro Mathys - 1.0-7 +- Fixed regression with missing Provides/Obsoletes for javadocs +- Fixed changelog format + +* Sun May 23 2010 Sandro Mathys - 1.0-6 +- Fixed Maven depmap to use commons-compress + +* Thu May 13 2010 Sandro Mathys - 1.0-5 +- Added missing Provides/Obsoletes for javadocs + +* Mon May 10 2010 Sandro Mathys - 1.0-4 +- Cleared some problems after the review + +* Thu May 06 2010 Sandro Mathys - 1.0-3 +- Now using maven2 (mvn-jpp) instead of directly calling javac & co + +* Tue May 04 2010 Sandro Mathys - 1.0-2 +- Renamed from jakarta-commons-compress From 44658482f50288d86afc1f41d6e9639478e7cfb5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 02:15:55 +0200 Subject: [PATCH 42/55] Update to upstream version 1.27.1 - Resolves: rhbz#2283072 --- .gitignore | 1 + 0003-Remove-Pack200-compressor.patch | 18 +++++++++--------- apache-commons-compress.spec | 7 ++++--- sources | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index ab4a5c5..07cbc5d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /commons-compress-1.20-src.tar.gz /commons-compress-1.21-src.tar.gz /commons-compress-1.25.0-src.tar.gz +/commons-compress-1.27.1-src.tar.gz diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch index 64b3079..e80d6fa 100644 --- a/0003-Remove-Pack200-compressor.patch +++ b/0003-Remove-Pack200-compressor.patch @@ -1,6 +1,6 @@ -From 2db4e6319326e584051ebefd565675356ab0a3cc Mon Sep 17 00:00:00 2001 +From d31ed816bd3dc7743cba7e1196c730f41cdf98e0 Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Fri, 8 Dec 2023 14:18:18 +0100 +Date: Mon, 11 Mar 2024 12:16:28 +0100 Subject: [PATCH] Remove Pack200 compressor --- @@ -8,7 +8,7 @@ Subject: [PATCH] Remove Pack200 compressor 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index 16bc88e..f3c7f3f 100644 +index a980aef..dc6aeb9 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java @@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre @@ -20,7 +20,7 @@ index 16bc88e..f3c7f3f 100644 import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; -@@ -265,10 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -249,10 +247,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { return GZIP; } @@ -28,10 +28,10 @@ index 16bc88e..f3c7f3f 100644 - return PACK200; - } - - if (compressorNames.contains(SNAPPY_FRAMED) && - FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { + if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { return SNAPPY_FRAMED; -@@ -619,7 +613,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + } +@@ -558,7 +552,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (PACK200.equalsIgnoreCase(name)) { @@ -40,7 +40,7 @@ index 16bc88e..f3c7f3f 100644 } if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -700,7 +694,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -631,7 +625,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (PACK200.equalsIgnoreCase(name)) { @@ -50,5 +50,5 @@ index 16bc88e..f3c7f3f 100644 if (LZMA.equalsIgnoreCase(name)) { -- -2.43.0 +2.44.0 diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 3720e3c..4e13a7c 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-compress -Version: 1.25.0 +Version: 1.27.1 Release: %autorelease Summary: Java API for working with compressed files and archivers License: Apache-2.0 @@ -19,6 +19,9 @@ Patch: 0003-Remove-Pack200-compressor.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.commons:commons-lang3) 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) @@ -61,8 +64,6 @@ rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java %pom_remove_dep org.ops4j.pax.exam:::test %pom_remove_dep :org.apache.felix.framework::test %pom_remove_dep :javax.inject::test -%pom_remove_dep :slf4j-api::test -rm src/test/java/org/apache/commons/compress/OsgiITest.java # Not packaged %pom_remove_dep com.github.marschall:memoryfilesystem diff --git a/sources b/sources index 016e281..df5b698 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.25.0-src.tar.gz) = 58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a +SHA512 (commons-compress-1.27.1-src.tar.gz) = c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab From 475aed87224eb1967788cb16a249ea1e8fcc4288 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 43/55] Use %autosetup -C --- apache-commons-compress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 4e13a7c..d7248e1 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -43,7 +43,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%autosetup -p1 -n commons-compress-%{version}-src +%autosetup -p1 -C # Unavailable Google Brotli library (org.brotli.dec) %pom_remove_dep org.brotli:dec From 5e583dbf431fbeea0d25c7e6ae7b13f1be0c0079 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 44/55] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From c7e9f1d193fef6ced8b13ec74820afaac8bffef0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 45/55] Update javadoc package description [skip changelog] --- apache-commons-compress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index d7248e1..f682faf 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -40,7 +40,7 @@ but it has been removed form this package. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep %autosetup -p1 -C From 0fcaf87bd7c2ba746ce3f7c3945f67083949c1cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:15:07 +0000 Subject: [PATCH 46/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 591442ea15ca34e7da44b0f2657a7e7c519b6627 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 47/55] Remove javadoc subpackage --- apache-commons-compress.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index f682faf..bd57151 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -29,6 +29,8 @@ BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.tukaani:xz) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.27.1-7 %description The Apache Commons Compress library defines an API for working with @@ -36,12 +38,6 @@ ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files. In version 1.14 read-only support for Brotli decompression has been added, but it has been removed form this package. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -73,7 +69,7 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %mvn_file : commons-compress %{name} %mvn_alias : commons: # XXX failing tests, need to investigate why -%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.compress +%mvn_build -j -f -- -Dcommons.osgi.symbolicName=org.apache.commons.compress %install %mvn_install @@ -81,8 +77,5 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe %files -f .mfiles %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From e104ee682ddf0332991ebbdd08ab8f9551d0d4d5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 48/55] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From dc625d0326bab74247ac8535706509304b5a1a8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 49/55] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 6fa3b9c97f13b1e9f450980db8e90a246902d783 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 50/55] Build with OpenJDK 25 --- apache-commons-compress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index bd57151..8f9cbd3 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -18,7 +18,7 @@ Patch: 0003-Remove-Pack200-compressor.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.apache.commons:commons-lang3) From 27497121119b27eba2378cf7a8991df302c7928b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 21:29:07 +0200 Subject: [PATCH 51/55] Replace unmappable character --- 0001-Remove-Brotli-compressor.patch | 12 ++++----- 0002-Remove-ZSTD-compressor.patch | 16 ++++++------ 0003-Remove-Pack200-compressor.patch | 16 ++++++------ ...Replace-unmappable-character-with-oe.patch | 25 +++++++++++++++++++ apache-commons-compress.spec | 1 + 5 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 0004-Replace-unmappable-character-with-oe.patch diff --git a/0001-Remove-Brotli-compressor.patch b/0001-Remove-Brotli-compressor.patch index 2cb97b9..9819212 100644 --- a/0001-Remove-Brotli-compressor.patch +++ b/0001-Remove-Brotli-compressor.patch @@ -1,17 +1,17 @@ -From d42b16c3334229cc400c6713f3bd11c8df2f70cc Mon Sep 17 00:00:00 2001 +From baa34cad14cc87d9d9d882f5de7756dcfeb65d66 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:53:48 +0100 -Subject: [PATCH 1/3] Remove Brotli compressor +Subject: [PATCH 1/4] Remove Brotli compressor --- .../compress/compressors/CompressorStreamFactory.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index db0d305..0f1394f 100644 +index 376253cf2..b3e2d9d8b 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -31,8 +31,6 @@ import java.util.Set; +@@ -30,8 +30,6 @@ import java.util.SortedMap; import java.util.TreeMap; @@ -20,7 +20,7 @@ index db0d305..0f1394f 100644 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; -@@ -579,10 +577,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (BROTLI.equalsIgnoreCase(name)) { @@ -33,5 +33,5 @@ index db0d305..0f1394f 100644 if (XZ.equalsIgnoreCase(name)) { -- -2.20.1 +2.50.1 diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index 244a153..6fca0ea 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -1,17 +1,17 @@ -From 575df9b9a3519186ac801a10eb632e0e2b4ddbdd Mon Sep 17 00:00:00 2001 +From 7a6e9dd260086ef90e78e244543d2c010c0f8112 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:59:55 +0100 -Subject: [PATCH 2/3] Remove ZSTD compressor +Subject: [PATCH 2/4] Remove ZSTD compressor --- .../compressors/CompressorStreamFactory.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index 95b6e45..16bc88e 100644 +index b3e2d9d8b..c8aaf18b7 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZUtils; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; @@ -21,7 +21,7 @@ index 95b6e45..16bc88e 100644 import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.Sets; -@@ -297,10 +294,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set compressor return LZ4_FRAMED; } @@ -32,7 +32,7 @@ index 95b6e45..16bc88e 100644 throw new CompressorException("No Compressor found for the stream signature."); } -@@ -615,10 +608,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -554,10 +547,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -44,7 +44,7 @@ index 95b6e45..16bc88e 100644 } if (LZMA.equalsIgnoreCase(name)) { -@@ -734,7 +724,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -665,7 +655,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -54,5 +54,5 @@ index 95b6e45..16bc88e 100644 } catch (final IOException e) { throw new CompressorException("Could not create CompressorOutputStream", e); -- -2.43.0 +2.50.1 diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch index e80d6fa..b98b256 100644 --- a/0003-Remove-Pack200-compressor.patch +++ b/0003-Remove-Pack200-compressor.patch @@ -1,17 +1,17 @@ -From d31ed816bd3dc7743cba7e1196c730f41cdf98e0 Mon Sep 17 00:00:00 2001 +From f147fee1b965153d486cb8db90f6f8edf94fa206 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 11 Mar 2024 12:16:28 +0100 -Subject: [PATCH] Remove Pack200 compressor +Subject: [PATCH 3/4] Remove Pack200 compressor --- .../compress/compressors/CompressorStreamFactory.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index a980aef..dc6aeb9 100644 +index c8aaf18b7..66e67ff3a 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre +@@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; import org.apache.commons.compress.compressors.lzma.LZMAUtils; @@ -20,7 +20,7 @@ index a980aef..dc6aeb9 100644 import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; -@@ -249,10 +247,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -249,10 +247,6 @@ static String detect(final InputStream inputStream, final Set compressor return GZIP; } @@ -31,7 +31,7 @@ index a980aef..dc6aeb9 100644 if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { return SNAPPY_FRAMED; } -@@ -558,7 +552,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -558,7 +552,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (PACK200.equalsIgnoreCase(name)) { @@ -40,7 +40,7 @@ index a980aef..dc6aeb9 100644 } if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -631,7 +625,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -631,7 +625,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, } if (PACK200.equalsIgnoreCase(name)) { @@ -50,5 +50,5 @@ index a980aef..dc6aeb9 100644 if (LZMA.equalsIgnoreCase(name)) { -- -2.44.0 +2.50.1 diff --git a/0004-Replace-unmappable-character-with-oe.patch b/0004-Replace-unmappable-character-with-oe.patch new file mode 100644 index 0000000..4db948d --- /dev/null +++ b/0004-Replace-unmappable-character-with-oe.patch @@ -0,0 +1,25 @@ +From f6a421af6828f7e8226fa3e779436174bf9c07fe Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 16 Jul 2025 21:26:45 +0200 +Subject: [PATCH 4/4] Replace unmappable character with oe + +--- + .../commons/compress/archivers/tar/TarArchiveOutputStream.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java +index 4f3588d9b..18dea2845 100644 +--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java ++++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java +@@ -276,7 +276,7 @@ private void addPaxHeadersForBigNumbers(final Map paxHeaders, fi + addPaxHeaderForBigNumber(paxHeaders, "uid", entry.getLongUserId(), TarConstants.MAXID); + // libarchive extensions + addFileTimePaxHeader(paxHeaders, "LIBARCHIVE.creationtime", entry.getCreationTime()); +- // star extensions by Jörg Schilling ++ // star extensions by Joerg Schilling + addPaxHeaderForBigNumber(paxHeaders, "SCHILY.devmajor", entry.getDevMajor(), TarConstants.MAXID); + addPaxHeaderForBigNumber(paxHeaders, "SCHILY.devminor", entry.getDevMinor(), TarConstants.MAXID); + // there is no PAX header for file mode +-- +2.50.1 + diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 8f9cbd3..8bd0ca0 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -14,6 +14,7 @@ Source0: https://archive.apache.org/dist/commons/compress/source/commons- Patch: 0001-Remove-Brotli-compressor.patch Patch: 0002-Remove-ZSTD-compressor.patch Patch: 0003-Remove-Pack200-compressor.patch +Patch: 0004-Replace-unmappable-character-with-oe.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 842de94b8397a917af142c0f354a70d0c11fcceb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:35 +0000 Subject: [PATCH 52/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From bdaf66ef9ff399da1630157e23cdad5cd4f37b17 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:03:10 +0200 Subject: [PATCH 53/55] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From c4b47a98684a07a826388ce7b123dcbc960a486b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 10 Oct 2025 15:46:12 +0200 Subject: [PATCH 54/55] Update to upstream version 1.28.0 --- .gitignore | 1 + 0001-Remove-Brotli-compressor.patch | 17 ++-- 0002-Remove-ZSTD-compressor.patch | 82 +++++++++++++++---- 0003-Remove-Pack200-compressor.patch | 32 ++++---- ...Replace-unmappable-character-with-oe.patch | 25 ------ apache-commons-compress.spec | 3 +- sources | 2 +- 7 files changed, 93 insertions(+), 69 deletions(-) delete mode 100644 0004-Replace-unmappable-character-with-oe.patch diff --git a/.gitignore b/.gitignore index 07cbc5d..19fa2fa 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /commons-compress-1.21-src.tar.gz /commons-compress-1.25.0-src.tar.gz /commons-compress-1.27.1-src.tar.gz +/commons-compress-1.28.0-src.tar.gz diff --git a/0001-Remove-Brotli-compressor.patch b/0001-Remove-Brotli-compressor.patch index 9819212..d1fe4be 100644 --- a/0001-Remove-Brotli-compressor.patch +++ b/0001-Remove-Brotli-compressor.patch @@ -1,17 +1,18 @@ -From baa34cad14cc87d9d9d882f5de7756dcfeb65d66 Mon Sep 17 00:00:00 2001 +From 1bc6dadd753f5eb66401d8455bcfc108f1919f74 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:53:48 +0100 -Subject: [PATCH 1/4] Remove Brotli compressor +Subject: [PATCH 1/3] Remove Brotli compressor +Forwarded: not-needed --- .../compress/compressors/CompressorStreamFactory.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index 376253cf2..b3e2d9d8b 100644 +index 9287d99..9a65ba4 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -30,8 +30,6 @@ +@@ -29,8 +29,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -20,9 +21,9 @@ index 376253cf2..b3e2d9d8b 100644 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; -@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina +@@ -603,10 +601,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new BZip2CompressorInputStream(in, actualDecompressConcatenated); } - if (BROTLI.equalsIgnoreCase(name)) { - if (!BrotliUtils.isBrotliCompressionAvailable()) { - throw new CompressorException("Brotli compression is not available." + YOU_NEED_BROTLI_DEC); @@ -30,8 +31,8 @@ index 376253cf2..b3e2d9d8b 100644 - return new BrotliCompressorInputStream(in); + throw new CompressorException("Brotli compression is not available in this build."); } - if (XZ.equalsIgnoreCase(name)) { + if (!XZUtils.isXZCompressionAvailable()) { -- -2.50.1 +2.51.0 diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index 6fca0ea..1399f22 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -1,17 +1,66 @@ -From 7a6e9dd260086ef90e78e244543d2c010c0f8112 Mon Sep 17 00:00:00 2001 +From 9a061729b0976ded5a739765fcdfc0c56bd0e46c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:59:55 +0100 -Subject: [PATCH 2/4] Remove ZSTD compressor +Subject: [PATCH 2/3] Remove ZSTD compressor +Forwarded: not-needed --- - .../compressors/CompressorStreamFactory.java | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) + .../archivers/zip/ZipArchiveInputStream.java | 3 +-- + .../commons/compress/archivers/zip/ZipFile.java | 7 ++++--- + .../compressors/CompressorStreamFactory.java | 13 ++----------- + 3 files changed, 7 insertions(+), 16 deletions(-) +diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +index b6d0abc..81ddb57 100644 +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +@@ -45,7 +45,6 @@ import org.apache.commons.compress.archivers.ArchiveEntry; + import org.apache.commons.compress.archivers.ArchiveInputStream; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; + import org.apache.commons.compress.utils.ArchiveUtils; + import org.apache.commons.compress.utils.IOUtils; + import org.apache.commons.compress.utils.InputStreamStatistics; +@@ -522,7 +521,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream i + * @since 1.28.0 + */ + protected InputStream createZstdInputStream(final InputStream in) throws IOException { +- return new ZstdCompressorInputStream(in); ++ throw new IOException("Zstandard compression is not available in this build."); + } + + /** +diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +index 264ac33..5535a57 100644 +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +@@ -55,7 +55,6 @@ import org.apache.commons.compress.archivers.EntryStreamOffsets; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; + import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; + import org.apache.commons.compress.utils.BoundedArchiveInputStream; + import org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream; + import org.apache.commons.compress.utils.IOUtils; +@@ -1083,8 +1082,10 @@ public class ZipFile implements Closeable { + */ + @SuppressWarnings("resource") + InputStream createZstdInputStream(final InputStream in) throws IOException { +- // This method is the only location that references ZstdCompressorInputStream directly to avoid requiring the JAR for all use cases. +- return zstdInputStreamFactory != null ? zstdInputStreamFactory.apply(in) : new ZstdCompressorInputStream(in); ++ if (zstdInputStreamFactory == null) { ++ throw new IOException("Zstandard compression is not available in this build."); ++ } ++ return zstdInputStreamFactory.apply(in); + } + + private void fillNameMap() { diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index b3e2d9d8b..c8aaf18b7 100644 +index 9a65ba4..a7432c4 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -53,9 +53,6 @@ +@@ -52,9 +52,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZUtils; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; @@ -20,21 +69,20 @@ index b3e2d9d8b..c8aaf18b7 100644 -import org.apache.commons.compress.compressors.zstandard.ZstdUtils; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.Sets; - -@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set compressor + import org.apache.commons.lang3.StringUtils; +@@ -266,9 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (compressorNames.contains(LZ4_FRAMED) && FramedLZ4CompressorInputStream.matches(signature, signatureLength)) { return LZ4_FRAMED; } - - if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) { - return ZSTANDARD; - } -- throw new CompressorException("No Compressor found for the stream signature."); } -@@ -554,10 +547,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina +@@ -616,10 +610,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + // @formatter:on } - if (ZSTANDARD.equalsIgnoreCase(name)) { - if (!ZstdUtils.isZstdCompressionAvailable()) { - throw new CompressorException("Zstandard compression is not available." + YOU_NEED_ZSTD_JNI); @@ -42,17 +90,17 @@ index b3e2d9d8b..c8aaf18b7 100644 - return new ZstdCompressorInputStream(in); + throw new CompressorException("Zstandard compression is not available in this build."); } - if (LZMA.equalsIgnoreCase(name)) { -@@ -665,7 +655,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, + if (!LZMAUtils.isLZMACompressionAvailable()) { +@@ -707,7 +698,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new FramedLZ4CompressorOutputStream(out); } - if (ZSTANDARD.equalsIgnoreCase(name)) { - return new ZstdCompressorOutputStream(out); + throw new CompressorException("Zstandard compression is not available in this build."); } } catch (final IOException e) { - throw new CompressorException("Could not create CompressorOutputStream", e); + throw new CompressorException("Could not create CompressorOutputStream.", e); -- -2.50.1 +2.51.0 diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch index b98b256..9acdeb8 100644 --- a/0003-Remove-Pack200-compressor.patch +++ b/0003-Remove-Pack200-compressor.patch @@ -1,17 +1,18 @@ -From f147fee1b965153d486cb8db90f6f8edf94fa206 Mon Sep 17 00:00:00 2001 +From f5e9621355abba25bf18afb50c75045322617e78 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 11 Mar 2024 12:16:28 +0100 -Subject: [PATCH 3/4] Remove Pack200 compressor +Subject: [PATCH 3/3] Remove Pack200 compressor +Forwarded: not-needed --- - .../compress/compressors/CompressorStreamFactory.java | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) + .../compress/compressors/CompressorStreamFactory.java | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index c8aaf18b7..66e67ff3a 100644 +index a7432c4..3d405e7 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -44,8 +44,6 @@ +@@ -43,8 +43,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; import org.apache.commons.compress.compressors.lzma.LZMAUtils; @@ -20,35 +21,34 @@ index c8aaf18b7..66e67ff3a 100644 import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; -@@ -249,10 +247,6 @@ static String detect(final InputStream inputStream, final Set compressor +@@ -242,9 +240,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (compressorNames.contains(GZIP) && GzipCompressorInputStream.matches(signature, signatureLength)) { return GZIP; } - - if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) { - return PACK200; - } -- if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { return SNAPPY_FRAMED; } -@@ -558,7 +552,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina +@@ -619,7 +614,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return LZMACompressorInputStream.builder().setInputStream(in).setMemoryLimitKiB(memoryLimitInKb).get(); } - if (PACK200.equalsIgnoreCase(name)) { - return new Pack200CompressorInputStream(in); + throw new CompressorException("Pack200 compression is not available in this build."); } - if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -631,7 +625,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, + return new SnappyCompressorInputStream(in); +@@ -680,7 +675,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new XZCompressorOutputStream(out); } - if (PACK200.equalsIgnoreCase(name)) { - return new Pack200CompressorOutputStream(out); + throw new CompressorException("Pack200 compression is not available in this build."); } - if (LZMA.equalsIgnoreCase(name)) { + return new LZMACompressorOutputStream(out); -- -2.50.1 +2.51.0 diff --git a/0004-Replace-unmappable-character-with-oe.patch b/0004-Replace-unmappable-character-with-oe.patch deleted file mode 100644 index 4db948d..0000000 --- a/0004-Replace-unmappable-character-with-oe.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f6a421af6828f7e8226fa3e779436174bf9c07fe Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 16 Jul 2025 21:26:45 +0200 -Subject: [PATCH 4/4] Replace unmappable character with oe - ---- - .../commons/compress/archivers/tar/TarArchiveOutputStream.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java -index 4f3588d9b..18dea2845 100644 ---- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java -+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java -@@ -276,7 +276,7 @@ private void addPaxHeadersForBigNumbers(final Map paxHeaders, fi - addPaxHeaderForBigNumber(paxHeaders, "uid", entry.getLongUserId(), TarConstants.MAXID); - // libarchive extensions - addFileTimePaxHeader(paxHeaders, "LIBARCHIVE.creationtime", entry.getCreationTime()); -- // star extensions by Jörg Schilling -+ // star extensions by Joerg Schilling - addPaxHeaderForBigNumber(paxHeaders, "SCHILY.devmajor", entry.getDevMajor(), TarConstants.MAXID); - addPaxHeaderForBigNumber(paxHeaders, "SCHILY.devminor", entry.getDevMinor(), TarConstants.MAXID); - // there is no PAX header for file mode --- -2.50.1 - diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 8bd0ca0..e170941 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-compress -Version: 1.27.1 +Version: 1.28.0 Release: %autorelease Summary: Java API for working with compressed files and archivers License: Apache-2.0 @@ -14,7 +14,6 @@ Source0: https://archive.apache.org/dist/commons/compress/source/commons- Patch: 0001-Remove-Brotli-compressor.patch Patch: 0002-Remove-ZSTD-compressor.patch Patch: 0003-Remove-Pack200-compressor.patch -Patch: 0004-Replace-unmappable-character-with-oe.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap diff --git a/sources b/sources index df5b698..ae715dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.27.1-src.tar.gz) = c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab +SHA512 (commons-compress-1.28.0-src.tar.gz) = cd37f7d554dff9f1cf9c90e93a30b7b15ace002d69d317a63d575fd623b4e64dbd55fbf2876ecd5333cf96858a37458f55762e5505311a7a8063d0cc8cdc4120 From da4b953cafbcf68ad8d0ff7fc85299ed54d0fb70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:46:49 +0000 Subject: [PATCH 55/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild