From ee4de49b2feafd39b335510efa82633fc382d7ce Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Thu, 8 Jan 2026 12:06:37 -0500 Subject: [PATCH] =?UTF-8?q?Revert=20"Upgrade=20apache-commons-compress=20t?= =?UTF-8?q?o=201.26.1=20and=20address=20depende=E2=80=A6=20(#15467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apache-commons-codec.spec | 11 +- .../0001-Remove-Brotli-compressor.patch | 14 +- .../0002-Remove-ZSTD-compressor.patch | 57 +-- .../0003-Remove-Pack200-compressor.patch | 54 --- .../apache-commons-compress-build.xml | 39 +- .../apache-commons-compress.signatures.json | 5 +- .../apache-commons-compress.spec | 84 ++-- .../commons-compress-1.19-src.tar.gz.asc | 7 + .../fix_java_8_compatibility.patch | 403 ++++++++++++++++++ .../apache-commons-io/apache-commons-io.spec | 10 +- .../xz-java/xz-java-module-info.patch | 37 -- .../xz-java/xz-java-source-version.patch | 11 + .../xz-java/xz-java.signatures.json | 4 +- SPECS-EXTENDED/xz-java/xz-java.spec | 45 +- cgmanifest.json | 8 +- 15 files changed, 540 insertions(+), 249 deletions(-) delete mode 100644 SPECS-EXTENDED/apache-commons-compress/0003-Remove-Pack200-compressor.patch create mode 100644 SPECS-EXTENDED/apache-commons-compress/commons-compress-1.19-src.tar.gz.asc create mode 100644 SPECS-EXTENDED/apache-commons-compress/fix_java_8_compatibility.patch delete mode 100644 SPECS-EXTENDED/xz-java/xz-java-module-info.patch create mode 100644 SPECS-EXTENDED/xz-java/xz-java-source-version.patch diff --git a/SPECS-EXTENDED/apache-commons-codec/apache-commons-codec.spec b/SPECS-EXTENDED/apache-commons-codec/apache-commons-codec.spec index 115d7b981d4..34abb876f71 100644 --- a/SPECS-EXTENDED/apache-commons-codec/apache-commons-codec.spec +++ b/SPECS-EXTENDED/apache-commons-codec/apache-commons-codec.spec @@ -24,7 +24,7 @@ Distribution: Azure Linux %bcond_with tests Name: apache-commons-codec Version: 1.15 -Release: 3%{?dist} +Release: 2%{?dist} Summary: Apache Commons Codec Package License: Apache-2.0 Group: Development/Libraries/Java @@ -104,10 +104,6 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ -# Remove LICENSE from javadoc directory to avoid duplicate license warning -mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . -mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . - %fdupes -s %{buildroot}%{_javadocdir} %pre javadoc @@ -117,7 +113,6 @@ fi %files -f .mfiles %license LICENSE.txt -%license ADDITIONAL_LICENSE_INFO %doc RELEASE-NOTES.txt %{_javadir}/%{name}.jar @@ -125,10 +120,6 @@ fi %{_javadocdir}/%{name} %changelog -* Fri Nov 28 2025 Durga Jagadeesh Palli - 1.15-3 -- Address build error caused by license warning -- License verified - * Thu Oct 14 2021 Pawel Winogrodzki - 1.15-2 - Converting the 'Release' tag to the '[number].[distribution]' format. diff --git a/SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch b/SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch index c88bf346396..f733b3464ff 100644 --- a/SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch +++ b/SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch @@ -1,17 +1,17 @@ -From 0b10cc9b13fa782b7e318fdbc0d8c790a472f722 Mon Sep 17 00:00:00 2001 +From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c 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/2] Remove Brotli compressor --- - .../compress/compressors/CompressorStreamFactory.java | 7 +------ + .../commons/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 ca0973095..2406d5a44 100644 +index d730b9d..ab178a9 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 @@ +@@ -31,8 +31,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -20,7 +20,7 @@ index ca0973095..2406d5a44 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 +@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (BROTLI.equalsIgnoreCase(name)) { @@ -33,5 +33,5 @@ index ca0973095..2406d5a44 100644 if (XZ.equalsIgnoreCase(name)) { -- -2.43.0 +2.14.3 diff --git a/SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch b/SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch index f629657e7a9..dbb7755fdef 100644 --- a/SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch +++ b/SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch @@ -1,17 +1,17 @@ -From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001 +From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 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/2] Remove ZSTD compressor --- - .../compressors/CompressorStreamFactory.java | 22 ++++--------------- - 1 file changed, 4 insertions(+), 18 deletions(-) + .../compress/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 2406d5a44..9ed40a3d7 100644 +index ab178a9..3817704 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 @@ +@@ -54,9 +54,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,40 +19,20 @@ index 2406d5a44..9ed40a3d7 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.Sets; - -@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set compressor + import org.apache.commons.compress.utils.Lists; + import org.apache.commons.compress.utils.ServiceLoaderIterator; +@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { return LZ4_FRAMED; } -- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) { +- if (ZstdUtils.matches(signature, signatureLength)) { - return ZSTANDARD; - } - throw new CompressorException("No Compressor found for the stream signature."); } - -@@ -405,10 +398,6 @@ public static String getZ() { - return Z; - } - -- public static String getZstandard() { -- return ZSTANDARD; -- } -- - static void putAll(final Set names, final CompressorStreamProvider provider, final TreeMap map) { - names.forEach(name -> map.put(toKey(name), provider)); - } -@@ -513,7 +502,7 @@ public CompressorInputStream createCompressorInputStream(final InputStream in, f - * Creates a compressor input stream from a compressor name and an input stream. - * - * @param name of the compressor, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #LZMA}, {@value #PACK200}, {@value #SNAPPY_RAW}, -- * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #ZSTANDARD}, {@value #DEFLATE64} or -+ * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #DEFLATE64} or - * {@value #DEFLATE} - * @param in the input stream - * @return compressor input stream -@@ -554,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina + /** +@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -64,16 +44,7 @@ index 2406d5a44..9ed40a3d7 100644 } if (LZMA.equalsIgnoreCase(name)) { -@@ -614,7 +600,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina - * Creates a compressor output stream from a compressor name and an output stream. - * - * @param name the compressor name, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #PACK200}, {@value #SNAPPY_FRAMED}, {@value #LZ4_BLOCK}, -- * {@value #LZ4_FRAMED}, {@value #ZSTANDARD} or {@value #DEFLATE} -+ * {@value #LZ4_FRAMED} or {@value #DEFLATE} - * @param out the output stream - * @return the compressor output stream - * @throws CompressorException if the archiver name is not known -@@ -665,7 +651,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi +@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -83,5 +54,5 @@ index 2406d5a44..9ed40a3d7 100644 } catch (final IOException e) { throw new CompressorException("Could not create CompressorOutputStream", e); -- -2.43.0 +2.14.3 diff --git a/SPECS-EXTENDED/apache-commons-compress/0003-Remove-Pack200-compressor.patch b/SPECS-EXTENDED/apache-commons-compress/0003-Remove-Pack200-compressor.patch deleted file mode 100644 index 2f9e4bd49f9..00000000000 --- a/SPECS-EXTENDED/apache-commons-compress/0003-Remove-Pack200-compressor.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 77d08229cd95cc948a19996faa8515e0d77d7930 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 6 Aug 2021 13:42:40 +0200 -Subject: [PATCH 3/3] 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 9ed40a3d7..565aa519e 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.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; -@@ -249,10 +247,6 @@ static String detect(final InputStream inputStream, final Set compressor - return GZIP; - } - -- if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) { -- return PACK200; -- } -- - if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { - return SNAPPY_FRAMED; - } -@@ -554,7 +548,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina - } - - if (PACK200.equalsIgnoreCase(name)) { -- return new Pack200CompressorInputStream(in); -+ throw new CompressorException("Pack200 compression is not available in this build."); - } - - if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -627,7 +621,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi - } - - if (PACK200.equalsIgnoreCase(name)) { -- return new Pack200CompressorOutputStream(out); -+ throw new CompressorException("Pack200 compression is not available in this build."); - } - - if (LZMA.equalsIgnoreCase(name)) { --- -2.43.0 - diff --git a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress-build.xml b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress-build.xml index f2e3a7a38fe..f81cc994454 100644 --- a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress-build.xml +++ b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress-build.xml @@ -9,24 +9,27 @@ - + - - + + + + + + - - + + - - - + + @@ -61,15 +64,21 @@ optimize="false" deprecation="true" target="${compiler.target}" - release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> - + + + + + + + + @@ -78,7 +87,7 @@ - + + @@ -113,12 +124,10 @@ basedir="${build.outputDir}" excludes="**/package.html"> - - - - + + diff --git a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.signatures.json b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.signatures.json index 75cbc39ab31..000ec54de67 100644 --- a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.signatures.json +++ b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { - "apache-commons-compress-build.xml": "b08148f1c54080179fdc8c6afc5f4d9c414367fb191a546c4bd3cc24be914abb", - "commons-compress-1.26.1-src.tar.gz": "0fd4a84162f5edcca757b4d0048e7abd78272e1b6794f9f0b2b42832ead922ed" + "apache-commons-compress-build.xml": "a2b5bf60863391c673afb1ddcfec071d34d460ef4db2b92f4fa31a76951dc67e", + "commons-compress-1.19-src.tar.gz": "34217d8e831c7e769d24ade60e41aa48c71200f772f18216205c00b9b2a11d4b", + "commons-compress-1.19-src.tar.gz.asc": "119f182d6fe0a74c5923193d509a0a012baca1efcff98a96aa4c54c48c23bfc3" } } diff --git a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.spec b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.spec index 59451832c20..4dd790b1099 100644 --- a/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.spec +++ b/SPECS-EXTENDED/apache-commons-compress/apache-commons-compress.spec @@ -1,37 +1,44 @@ Vendor: Microsoft Corporation Distribution: Azure Linux - # -# spec file for package apache-commons-compress +# spec file for package apache +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # -# Copyright (c) 2024 SUSE LLC +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global base_name compress %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.26.1 -Release: 1%{?dist} +Version: 1.19 +Release: 3%{?dist} Summary: Java API for working with compressed files and archivers License: Apache-2.0 Group: Development/Libraries/Java -URL: https://commons.apache.org/proper/commons-compress/ -Source0: https://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz -Source1: %{name}-build.xml +URL: http://commons.apache.org/proper/commons-compress/ +Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz +Source1: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz.asc +Source2: %{name}-build.xml Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch -Patch2: 0003-Remove-Pack200-compressor.patch +Patch2: fix_java_8_compatibility.patch BuildRequires: ant -BuildRequires: commons-codec -BuildRequires: commons-io >= 2.14 -BuildRequires: commons-lang3 BuildRequires: fdupes -BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local-bootstrap >= 6 +BuildRequires: java-devel >= 1.7 +BuildRequires: javapackages-local-bootstrap BuildRequires: xz-java -BuildRequires: xml-commons-apis -BuildRequires: javapackages-tools - +Requires: xz Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release} @@ -42,7 +49,7 @@ BuildArch: noarch The Apache Commons Compress library defines an API for working with 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 from this package. +but it has been removed form this package. %package javadoc Summary: API documentation for %{name} @@ -53,34 +60,40 @@ This package provides %{summary}. %prep %setup -q -n %{short_name}-%{version}-src -cp %{SOURCE1} build.xml +cp %{SOURCE2} build.xml # Unavailable Google Brotli library (org.brotli.dec) -%patch -P 0 -p1 +%patch 0 -p1 %pom_remove_dep org.brotli:dec rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli # Unavailable ZSTD JNI library -%patch -P 1 -p1 +%patch 1 -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 + +# Restore Java 8 compatibility +%patch 2 -p1 -# Remove support for pack200 which depends on ancient asm:asm:3.2 -%patch -P 2 -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 -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 +%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 # NPE with jdk10 %pom_remove_plugin :maven-javadoc-plugin %pom_xpath_remove "pom:profiles/pom:profile[pom:id[text()='java9+']]" +%pom_remove_parent . +%pom_xpath_inject "pom:project" "org.apache.commons" . + %build mkdir -p lib -build-jar-repository -s lib xz-java commons-io commons-codec commons-lang3 +build-jar-repository -s lib xz-java %{ant} package javadoc %install @@ -95,28 +108,19 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} -# Remove LICENSE from javadoc directory to avoid duplicate license warning -mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . -mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . - %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %{_javadir}/%{name}.jar %license LICENSE.txt -%license ADDITIONAL_LICENSE_INFO -%license NOTICE.txt +%doc NOTICE.txt %files javadoc %{_javadocdir}/%{name} %license LICENSE.txt -%license NOTICE.txt +%doc NOTICE.txt %changelog -* Fri Nov 21 2025 Durga Jagadeesh Palli - 1.26.1-1 -- Upgrade from openSUSE Tumbleweed. -- License verified - * Mon Nov 14 2022 Sumedh Sharma - 1.19-3 - Add Requires on xz instead of mvn(org.tukaani:xz) to fix package install failure - License verified diff --git a/SPECS-EXTENDED/apache-commons-compress/commons-compress-1.19-src.tar.gz.asc b/SPECS-EXTENDED/apache-commons-compress/commons-compress-1.19-src.tar.gz.asc new file mode 100644 index 00000000000..0d60dc4ff57 --- /dev/null +++ b/SPECS-EXTENDED/apache-commons-compress/commons-compress-1.19-src.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHEEABEKADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCXWFijBMcYm9kZXdpZ0Bh +cGFjaGUub3JnAAoJEKIRWuFfa4tyNIkAn2gKkMs8N+T5giVT746EDm9sR8ypAKCe +9VpPXdbYTImJ4SYaSH+CUUOIYA== +=vNiG +-----END PGP SIGNATURE----- diff --git a/SPECS-EXTENDED/apache-commons-compress/fix_java_8_compatibility.patch b/SPECS-EXTENDED/apache-commons-compress/fix_java_8_compatibility.patch new file mode 100644 index 00000000000..cb578a567c0 --- /dev/null +++ b/SPECS-EXTENDED/apache-commons-compress/fix_java_8_compatibility.patch @@ -0,0 +1,403 @@ +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java +@@ -19,6 +19,7 @@ package org.apache.commons.compress.arch + + import java.io.IOException; + import java.io.InputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.SeekableByteChannel; + +@@ -69,7 +70,7 @@ class BoundedSeekableByteChannelInputStr + } else { + buf = ByteBuffer.allocate(bytesToRead); + bytesRead = channel.read(buf); +- buf.flip(); ++ ((Buffer)buf).flip(); + } + if (bytesRead >= 0) { + buf.get(b, off, bytesRead); +@@ -79,9 +80,9 @@ class BoundedSeekableByteChannelInputStr + } + + private int read(int len) throws IOException { +- buffer.rewind().limit(len); ++ ((Buffer)buffer).rewind().limit(len); + int read = channel.read(buffer); +- buffer.flip(); ++ ((Buffer)buffer).flip(); + return read; + } + +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java +@@ -25,6 +25,7 @@ import java.io.File; + import java.io.FilterInputStream; + import java.io.IOException; + import java.io.InputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.ByteOrder; + import java.nio.CharBuffer; +@@ -1305,9 +1306,9 @@ public class SevenZFile implements Close + } + + private void readFully(ByteBuffer buf) throws IOException { +- buf.rewind(); ++ ((Buffer)buf).rewind(); + IOUtils.readFully(channel, buf); +- buf.flip(); ++ ((Buffer)buf).flip(); + } + + @Override +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java +@@ -24,6 +24,7 @@ import java.io.DataOutputStream; + import java.io.File; + import java.io.IOException; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.ByteOrder; + import java.nio.channels.SeekableByteChannel; +@@ -288,7 +289,7 @@ public class SevenZOutputFile implements + crc32.reset(); + crc32.update(bb.array(), SevenZFile.sevenZSignature.length + 6, 20); + bb.putInt(SevenZFile.sevenZSignature.length + 2, (int) crc32.getValue()); +- bb.flip(); ++ ((Buffer)bb).flip(); + channel.write(bb); + } + +@@ -772,7 +773,7 @@ public class SevenZOutputFile implements + private final ByteBuffer buffer = ByteBuffer.allocate(BUF_SIZE); + @Override + public void write(final int b) throws IOException { +- buffer.clear(); ++ ((Buffer)buffer).clear(); + buffer.put((byte) b).flip(); + channel.write(buffer); + compressedCrc32.update(b); +@@ -790,7 +791,7 @@ public class SevenZOutputFile implements + if (len > BUF_SIZE) { + channel.write(ByteBuffer.wrap(b, off, len)); + } else { +- buffer.clear(); ++ ((Buffer)buffer).clear(); + buffer.put(b, off, len).flip(); + channel.write(buffer); + } +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java +@@ -20,6 +20,7 @@ + package org.apache.commons.compress.archivers.zip; + + import java.io.IOException; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.CharBuffer; + import java.nio.charset.Charset; +@@ -121,8 +122,8 @@ class NioZipEncoding implements ZipEncod + enc.encode(cb, out, true); + // may have caused underflow, but that's been ignored traditionally + +- out.limit(out.position()); +- out.rewind(); ++ ((Buffer)out).limit(out.position()); ++ ((Buffer)out).rewind(); + return out; + } + +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +@@ -25,6 +25,7 @@ import java.io.IOException; + import java.io.InputStream; + import java.io.PushbackInputStream; + import java.math.BigInteger; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.util.Arrays; + import java.util.zip.CRC32; +@@ -220,7 +221,7 @@ public class ZipArchiveInputStream exten + this.allowStoredEntriesWithDataDescriptor = + allowStoredEntriesWithDataDescriptor; + // haven't read anything so far +- buf.limit(0); ++ ((Buffer)buf).limit(0); + } + + public ZipArchiveEntry getNextZipEntry() throws IOException { +@@ -522,13 +523,13 @@ public class ZipArchiveInputStream exten + } + + if (buf.position() >= buf.limit()) { +- buf.position(0); ++ ((Buffer)buf).position(0); + final int l = in.read(buf.array()); + if (l == -1) { +- buf.limit(0); ++ ((Buffer)buf).limit(0); + throw new IOException("Truncated ZIP file"); + } +- buf.limit(l); ++ ((Buffer)buf).limit(l); + + count(l); + current.bytesReadFromStream += l; +@@ -719,7 +720,7 @@ public class ZipArchiveInputStream exten + } + + inf.reset(); +- buf.clear().flip(); ++ ((Buffer)buf).clear().flip(); + current = null; + lastStoredEntry = null; + } +@@ -784,7 +785,7 @@ public class ZipArchiveInputStream exten + } + final int length = in.read(buf.array()); + if (length > 0) { +- buf.limit(length); ++ ((Buffer)buf).limit(length); + count(buf.limit()); + inf.setInput(buf.array(), 0, buf.limit()); + } +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java +@@ -18,6 +18,7 @@ + + package org.apache.commons.compress.archivers.zip; + ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.charset.Charset; + import java.nio.charset.StandardCharsets; +@@ -85,8 +86,8 @@ public abstract class ZipEncodingHelper + } + + static ByteBuffer growBufferBy(ByteBuffer buffer, int increment) { +- buffer.limit(buffer.position()); +- buffer.rewind(); ++ ((Buffer)buffer).limit(buffer.position()); ++ ((Buffer)buffer).rewind(); + + final ByteBuffer on = ByteBuffer.allocate(buffer.capacity() + increment); + +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +@@ -25,6 +25,7 @@ import java.io.File; + import java.io.IOException; + import java.io.InputStream; + import java.io.SequenceInputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.channels.FileChannel; + import java.nio.channels.SeekableByteChannel; +@@ -693,7 +694,7 @@ public class ZipFile implements Closeabl + + positionAtCentralDirectory(); + +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + long sig = ZipLong.getValue(wordBuf); + +@@ -704,7 +705,7 @@ public class ZipFile implements Closeabl + + while (sig == CFH_SIG) { + readCentralDirectoryEntry(noUTF8Flag); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + sig = ZipLong.getValue(wordBuf); + } +@@ -723,7 +724,7 @@ public class ZipFile implements Closeabl + private void + readCentralDirectoryEntry(final Map noUTF8Flag) + throws IOException { +- cfhBbuf.rewind(); ++ ((Buffer)cfhBbuf).rewind(); + IOUtils.readFully(archive, cfhBbuf); + int off = 0; + final Entry ze = new Entry(); +@@ -961,7 +962,7 @@ public class ZipFile implements Closeabl + archive.position() > ZIP64_EOCDL_LENGTH; + if (searchedForZip64EOCD) { + archive.position(archive.position() - ZIP64_EOCDL_LENGTH); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + found = Arrays.equals(ZipArchiveOutputStream.ZIP64_EOCD_LOC_SIG, + wordBuf); +@@ -990,10 +991,10 @@ public class ZipFile implements Closeabl + throws IOException { + skipBytes(ZIP64_EOCDL_LOCATOR_OFFSET + - WORD /* signature has already been read */); +- dwordBbuf.rewind(); ++ ((Buffer)dwordBbuf).rewind(); + IOUtils.readFully(archive, dwordBbuf); + archive.position(ZipEightByteInteger.getLongValue(dwordBuf)); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + if (!Arrays.equals(wordBuf, ZipArchiveOutputStream.ZIP64_EOCD_SIG)) { + throw new ZipException("Archive's ZIP64 end of central " +@@ -1001,7 +1002,7 @@ public class ZipFile implements Closeabl + } + skipBytes(ZIP64_EOCD_CFD_LOCATOR_OFFSET + - WORD /* signature has already been read */); +- dwordBbuf.rewind(); ++ ((Buffer)dwordBbuf).rewind(); + IOUtils.readFully(archive, dwordBbuf); + archive.position(ZipEightByteInteger.getLongValue(dwordBuf)); + } +@@ -1016,7 +1017,7 @@ public class ZipFile implements Closeabl + private void positionAtCentralDirectory32() + throws IOException { + skipBytes(CFD_LOCATOR_OFFSET); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + archive.position(ZipLong.getValue(wordBuf)); + } +@@ -1050,9 +1051,9 @@ public class ZipFile implements Closeabl + for (; off >= stopSearching; off--) { + archive.position(off); + try { +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); +- wordBbuf.flip(); ++ ((Buffer)wordBbuf).flip(); + } catch (EOFException ex) { // NOSONAR + break; + } +@@ -1153,9 +1154,9 @@ public class ZipFile implements Closeabl + private int[] setDataOffset(ZipArchiveEntry ze) throws IOException { + final long offset = ze.getLocalHeaderOffset(); + archive.position(offset + LFH_OFFSET_FOR_FILENAME_LENGTH); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); +- wordBbuf.flip(); ++ ((Buffer)wordBbuf).flip(); + wordBbuf.get(shortBuf); + final int fileNameLen = ZipShort.getValue(shortBuf); + wordBbuf.get(shortBuf); +@@ -1180,7 +1181,7 @@ public class ZipFile implements Closeabl + */ + private boolean startsWithLocalFileHeader() throws IOException { + archive.position(0); +- wordBbuf.rewind(); ++ ((Buffer)wordBbuf).rewind(); + IOUtils.readFully(archive, wordBbuf); + return Arrays.equals(wordBuf, ZipArchiveOutputStream.LFH_SIG); + } +@@ -1223,7 +1224,7 @@ public class ZipFile implements Closeabl + singleByteBuffer = ByteBuffer.allocate(1); + } + else { +- singleByteBuffer.rewind(); ++ ((Buffer)singleByteBuffer).rewind(); + } + int read = read(loc, singleByteBuffer); + if (read < 0) { +@@ -1262,7 +1263,7 @@ public class ZipFile implements Closeabl + archive.position(pos); + read = archive.read(buf); + } +- buf.flip(); ++ ((Buffer)buf).flip(); + return read; + } + } +@@ -1284,7 +1285,7 @@ public class ZipFile implements Closeabl + @Override + protected int read(long pos, ByteBuffer buf) throws IOException { + int read = archive.read(buf, pos); +- buf.flip(); ++ ((Buffer)buf).flip(); + return read; + } + } +Index: commons-compress-1.19-src/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java +=================================================================== +--- commons-compress-1.19-src.orig/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java ++++ commons-compress-1.19-src/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java +@@ -21,6 +21,7 @@ package org.apache.commons.compress.util + import java.io.FileOutputStream; + import java.io.IOException; + import java.io.OutputStream; ++import java.nio.Buffer; + import java.nio.ByteBuffer; + import java.nio.ByteOrder; + import java.nio.channels.ClosedChannelException; +@@ -88,7 +89,7 @@ public class FixedLengthBlockOutputStrea + } + + private void writeBlock() throws IOException { +- buffer.flip(); ++ ((Buffer)buffer).flip(); + int i = out.write(buffer); + boolean hasRemaining = buffer.hasRemaining(); + if (i != blockSize || hasRemaining) { +@@ -97,7 +98,7 @@ public class FixedLengthBlockOutputStrea + blockSize, i); + throw new IOException(msg); + } +- buffer.clear(); ++ ((Buffer)buffer).clear(); + } + + @Override +@@ -142,7 +143,7 @@ public class FixedLengthBlockOutputStrea + // fill up the reset of buffer and write the block. + if (buffer.position() != 0) { + int n = buffer.remaining(); +- src.limit(src.position() + n); ++ ((Buffer)src).limit(src.position() + n); + buffer.put(src); + writeBlock(); + srcLeft -= n; +@@ -150,12 +151,12 @@ public class FixedLengthBlockOutputStrea + // whilst we have enough bytes in src for complete blocks, + // write them directly from src without copying them to buffer + while (srcLeft >= blockSize) { +- src.limit(src.position() + blockSize); ++ ((Buffer)src).limit(src.position() + blockSize); + out.write(src); + srcLeft -= blockSize; + } + // copy any remaining bytes into buffer +- src.limit(savedLimit); ++ ((Buffer)src).limit(savedLimit); + buffer.put(src); + } + return srcRemaining; +@@ -240,9 +241,9 @@ public class FixedLengthBlockOutputStrea + + try { + int pos = buffer.position(); +- int len = buffer.limit() - pos; ++ int len = ((Buffer)buffer).limit() - pos; + out.write(buffer.array(), buffer.arrayOffset() + pos, len); +- buffer.position(buffer.limit()); ++ ((Buffer)buffer).position(buffer.limit()); + return len; + } catch (IOException e) { + try { diff --git a/SPECS-EXTENDED/apache-commons-io/apache-commons-io.spec b/SPECS-EXTENDED/apache-commons-io/apache-commons-io.spec index b288caea2e7..cef33b4447d 100644 --- a/SPECS-EXTENDED/apache-commons-io/apache-commons-io.spec +++ b/SPECS-EXTENDED/apache-commons-io/apache-commons-io.spec @@ -23,7 +23,7 @@ Distribution: Azure Linux %bcond_with tests Name: apache-%{short_name} Version: 2.14.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 Group: Development/Libraries/Java @@ -82,15 +82,10 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} -# Remove LICENSE from javadoc directory to avoid duplicate license warning -mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . -mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . - %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE.txt NOTICE.txt -%license ADDITIONAL_LICENSE_INFO %doc RELEASE-NOTES.txt %{_javadir}/%{name}.jar @@ -98,9 +93,6 @@ mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . %doc %{_javadocdir}/%{name} %changelog -* Fri Nov 28 2025 Durga Jagadeesh Palli - 2.14.0-2 -- Address build error caused by license warning - * Mon Oct 7 2024 Bhagyashri Pathak - 2.14.0-1 - Upgrade to 2.14.0 to fix the CVE-2024-47554. - License verified diff --git a/SPECS-EXTENDED/xz-java/xz-java-module-info.patch b/SPECS-EXTENDED/xz-java/xz-java-module-info.patch deleted file mode 100644 index 864c9817762..00000000000 --- a/SPECS-EXTENDED/xz-java/xz-java-module-info.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/build.xml 2025-07-03 17:34:58.653124868 +0200 -+++ b/build.xml 2025-07-03 17:50:13.872136109 +0200 -@@ -68,6 +68,16 @@ - includesfile="fileset-src9.txt"> - - -+ -+ -+ -+ -+ -+ - - - -@@ -102,7 +112,7 @@ - - -- -+ - - -@@ -112,6 +122,8 @@ - - -+ - - - diff --git a/SPECS-EXTENDED/xz-java/xz-java-source-version.patch b/SPECS-EXTENDED/xz-java/xz-java-source-version.patch new file mode 100644 index 00000000000..2989f6eb311 --- /dev/null +++ b/SPECS-EXTENDED/xz-java/xz-java-source-version.patch @@ -0,0 +1,11 @@ +--- xz-java-1.8.orig/build.properties 2016-11-26 22:39:44.000000000 +0100 ++++ xz-java-1.8/build.properties 2018-01-13 13:35:46.432055600 +0100 +@@ -17,7 +17,7 @@ + # The source code is Java 5 compatible but the oldest -source/-target pair + # that OpenJDK 9 supports is 1.6 (Java 6). Edit this if you are using + # OpenJDK 9 or later. +-sourcever = 1.5 ++sourcever = 1.8 + + src_dir = src + build_dir = build diff --git a/SPECS-EXTENDED/xz-java/xz-java.signatures.json b/SPECS-EXTENDED/xz-java/xz-java.signatures.json index aeb1940c77c..048dedd3d25 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.signatures.json +++ b/SPECS-EXTENDED/xz-java/xz-java.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "xz-java-1.10.zip": "c02a52da42f432fd5e9c8f30f8e0a9be775961d25740ec098b3f46b4d45f7fe5" + "xz-java-1.8.zip": "86be97adf59d19c000c5bac8c77f2fa2f84fa082d608c7ad2d07a007dce76160" } -} \ No newline at end of file +} diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index d84b8c7dd4c..c74b4ade1de 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -1,9 +1,7 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux # # spec file for package xz-java # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Peter Conrad # # All modifications and additions to the file contributed by third parties @@ -18,23 +16,25 @@ Distribution: Azure Linux # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: xz-java -Version: 1.10 -Release: 3%{?dist} Summary: Pure Java implementation of XZ compression -License: 0BSD +Name: xz-java +Version: 1.8 +Release: 5%{?dist} +License: Public Domain Group: Development/Libraries/Java -URL: https://tukaani.org/xz/java.html -Source0: https://tukaani.org/xz/xz-java-%{version}.zip -Patch0: xz-java-module-info.patch +Vendor: Microsoft Corporation +Distribution: Azure Linux +URL: http://tukaani.org/xz/java.html +Source: http://tukaani.org/xz/xz-java-%{version}.zip +Patch0: xz-java-source-version.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local-bootstrap >= 6 +BuildRequires: javapackages-local-bootstrap BuildRequires: unzip -Provides: java-xz = %{version}-%{release} -Obsoletes: java-xz < 1.8-5 BuildArch: noarch +Provides: java-xz +Obsoletes: java-xz %description This is an implementation of XZ data compression in pure Java. @@ -49,10 +49,12 @@ Group: Documentation/HTML This package contains the API documentation of xz-java. %prep -%autosetup -p1 -n %{name} -c +%setup -q -c -n %{name} +%patch 0 -p1 %build -ant -Dant.build.javac.{source,target}=8 clean jar doc maven +sed -i 's/linkoffline="[^"]*"//;/extdoc_/d' build.xml +ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 clean jar doc maven %install # jar @@ -64,28 +66,19 @@ install -dm 0755 %{buildroot}%{_mavenpomdir} install -pm 0644 build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc -install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} -# Remove LICENSE from javadoc directory to avoid duplicate license warning -mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . -mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . - %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license COPYING -%license ADDITIONAL_LICENSE_INFO -%doc {NEWS,README,THANKS}.md +%doc NEWS README THANKS %{_javadir}/xz.jar %files javadoc %{_javadocdir}/%{name} %changelog -* Mon Nov 24 2025 Durga Jagadeesh Palli - 1.10-3 -- Upgrade from openSUSE Tumbleweed. -- License verified - * Mon Mar 28 2022 Cameron Baird - 1.8-5 - Move to SPECS - License verified diff --git a/cgmanifest.json b/cgmanifest.json index fc9b6733ed4..80006b57c6c 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -335,8 +335,8 @@ "type": "other", "other": { "name": "apache-commons-compress", - "version": "1.26.1", - "downloadUrl": "https://archive.apache.org/dist/commons/compress/source/commons-compress-1.26.1-src.tar.gz" + "version": "1.19", + "downloadUrl": "http://archive.apache.org/dist/commons/compress/source/commons-compress-1.19-src.tar.gz" } } }, @@ -31189,8 +31189,8 @@ "type": "other", "other": { "name": "xz-java", - "version": "1.10", - "downloadUrl": "https://tukaani.org/xz/xz-java-1.10.zip" + "version": "1.8", + "downloadUrl": "http://tukaani.org/xz/xz-java-1.8.zip" } } },