From 54c80843dbe012263e22dc40b62962b37dc24f15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 16:35:48 +0200 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 45de21f4327f7b84bec828d30cec3b2474b74151 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Mar 2020 09:30:16 +0100 Subject: [PATCH 6/7] 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 7f5162820c3e91faee939834e9bfeaec4716ffbc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 7/7] 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