From 18414a46d5f019eba25f34e0020ef09cb4f685aa393ceab3afd0df238273050d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 14 May 2024 10:50:02 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-compress?expand=0&rev=34

---
 apache-commons-compress-build.xml  | 12 +++++++-----
 apache-commons-compress.changes    | 19 +++++++++++++++++++
 apache-commons-compress.spec       |  2 +-
 commons-compress-1.26.0-src.tar.gz |  3 ---
 commons-compress-1.26.1-src.tar.gz |  3 +++
 5 files changed, 30 insertions(+), 9 deletions(-)
 delete mode 100644 commons-compress-1.26.0-src.tar.gz
 create mode 100644 commons-compress-1.26.1-src.tar.gz

diff --git a/apache-commons-compress-build.xml b/apache-commons-compress-build.xml
index beea604..debfbf3 100644
--- a/apache-commons-compress-build.xml
+++ b/apache-commons-compress-build.xml
@@ -9,7 +9,7 @@
   <property file="build.properties"/>
 
   <property name="build.name" value="commons-compress"/>
-  <property name="build.version" value="1.26.0"/>
+  <property name="build.version" value="1.26.1"/>
   <property name="build.finalName" value="${build.name}-${build.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.javadocDir" value="${build.dir}/site/apidocs"/>
@@ -19,8 +19,8 @@
 
   <property name="commons.osgi.dynamicImport" value=""/>
   <property name="commons.osgi.excludeDependencies" value="true"/>
-  <property name="commons.osgi.export" value="org.apache.commons.compress;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.ar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${build.version}&quot;,org.apache.commons.compress.changes;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.pack200;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${build.version}&quot;,org.apache.commons.compress.harmony.archive.internal.nls;version=&quot;${build.version}&quot;,org.apache.commons.compress.harmony.pack200;version=&quot;${build.version}&quot;,org.apache.commons.compress.harmony.unpack200;version=&quot;${build.version}&quot;,org.apache.commons.compress.harmony.unpack200.bytecode;version=&quot;${build.version}&quot;,org.apache.commons.compress.harmony.unpack200.bytecode.forms;version=&quot;${build.version}&quot;,org.apache.commons.compress.java.util.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${build.version}&quot;,org.apache.commons.compress.utils;version=&quot;${build.version}&quot;"/>
-  <property name="commons.osgi.import" value="org.tukaani.xz;resolution:=optional,org.objectweb.asm;resolution:=optional,javax.crypto;resolution:=optional,javax.crypto.spec;resolution:=optional"/>
+  <property name="commons.osgi.export" value="org.apache.commons.compress.archivers.ar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${project.version}&quot;,org.apache.commons.compress.changes;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${project.version}&quot;,org.apache.commons.compress.java.util.jar;version=&quot;${project.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${project.version}&quot;,org.apache.commons.compress.utils;version=&quot;${project.version}&quot;,org.apache.commons.compress;version=&quot;${project.version}&quot;"/>
+  <property name="commons.osgi.import" value="javax.crypto.spec;resolution:=optional,javax.crypto;resolution:=optional,org.apache.commons.codec.digest;resolution:=optional,org.apache.commons.codec;resolution:=optional,org.apache.commons.io.build;resolution:=optional,org.apache.commons.io.file.attribute;resolution:=optional,org.apache.commons.io.input;resolution:=optional,org.apache.commons.io.output;resolution:=optional,org.apache.commons.io;resolution:=optional,org.apache.commons.lang3.reflect;resolution:=optional,org.apache.commons.lang3;resolution:=optional,org.objectweb.asm;resolution:=optional,org.tukaani.xz;resolution:=optional"/>
   <property name="commons.osgi.private" value=""/>
   <property name="commons.osgi.symbolicName" value="org.apache.commons.compress"/>
 
@@ -113,10 +113,12 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
+        <attribute name="Automatic-Module-Name" value="org.apache.commons.compress"/>
         <attribute name="Bundle-SymbolicName" value="${commons.osgi.symbolicName}"/>
         <attribute name="Bundle-Version" value="${build.version}"/>
-		<attribute name="Export-Package" value="${commons.osgi.export}"/>
-		<attribute name="Import-Package" value="${commons.osgi.import}"/>
+        <attribute name="Export-Package" value="${commons.osgi.export}"/>
+        <attribute name="Import-Package" value="${commons.osgi.import}"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
       </manifest>
     </jar>
   </target>
diff --git a/apache-commons-compress.changes b/apache-commons-compress.changes
index 8eddf68..623b91f 100644
--- a/apache-commons-compress.changes
+++ b/apache-commons-compress.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue May 14 10:26:58 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 1.26.1
+  * Fixed Bugs
+    + COMPRESS-659: TarArchiveOutputStream should use Commons IO
+      Charsets instead of Commons Codec Charsets.
+    + COMPRESS-660: Add org.apache.commons.codec to OSGi imports.
+    + COMPRESS-664 Return null value from getNextEntry() for empty
+      file.
+    + COMPRESS-664: Remove unused variables in tests.
+    + COMPRESS-666: Multithreaded access to Tar archive throws
+      java.util.zip.ZipException: Corrupt GZIP trailer.
+    + COMPRESS-644: ArchiveStreamFactory.detect(InputStream) returns
+      TAR for ICO file.
+    + COMPRESS-661: ArchiveInputStream markSupported should always
+      return false.
+    + COMPRESS-662: Remove out of date jar and scripts.
+
 -------------------------------------------------------------------
 Tue Feb 20 10:24:11 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 0f2c359..064add6 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -19,7 +19,7 @@
 %global base_name       compress
 %global short_name      commons-%{base_name}
 Name:           apache-%{short_name}
-Version:        1.26.0
+Version:        1.26.1
 Release:        0
 Summary:        Java API for working with compressed files and archivers
 License:        Apache-2.0
diff --git a/commons-compress-1.26.0-src.tar.gz b/commons-compress-1.26.0-src.tar.gz
deleted file mode 100644
index 203f690..0000000
--- a/commons-compress-1.26.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:577aa8a0f275f1f55f6b6d7f8095602fee8c7d4bd5bd9aef430b7d8ac2e024be
-size 54670636
diff --git a/commons-compress-1.26.1-src.tar.gz b/commons-compress-1.26.1-src.tar.gz
new file mode 100644
index 0000000..d659826
--- /dev/null
+++ b/commons-compress-1.26.1-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fd4a84162f5edcca757b4d0048e7abd78272e1b6794f9f0b2b42832ead922ed
+size 54843710

From da2cf59d9ae825b206097bfa2cb11c43f284ad5a5a1bda5dc97fcc3f4164f2ff Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 14 May 2024 13:27:15 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-compress?expand=0&rev=35

---
 apache-commons-compress-build.xml | 4 ++--
 apache-commons-compress.spec      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apache-commons-compress-build.xml b/apache-commons-compress-build.xml
index debfbf3..83d06a6 100644
--- a/apache-commons-compress-build.xml
+++ b/apache-commons-compress-build.xml
@@ -19,7 +19,7 @@
 
   <property name="commons.osgi.dynamicImport" value=""/>
   <property name="commons.osgi.excludeDependencies" value="true"/>
-  <property name="commons.osgi.export" value="org.apache.commons.compress.archivers.ar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${project.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${project.version}&quot;,org.apache.commons.compress.changes;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${project.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${project.version}&quot;,org.apache.commons.compress.java.util.jar;version=&quot;${project.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${project.version}&quot;,org.apache.commons.compress.utils;version=&quot;${project.version}&quot;,org.apache.commons.compress;version=&quot;${project.version}&quot;"/>
+  <property name="commons.osgi.export" value="org.apache.commons.compress.archivers.ar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${build.version}&quot;,org.apache.commons.compress.changes;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${build.version}&quot;,org.apache.commons.compress.java.util.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${build.version}&quot;,org.apache.commons.compress.utils;version=&quot;${build.version}&quot;,org.apache.commons.compress;version=&quot;${build.version}&quot;"/>
   <property name="commons.osgi.import" value="javax.crypto.spec;resolution:=optional,javax.crypto;resolution:=optional,org.apache.commons.codec.digest;resolution:=optional,org.apache.commons.codec;resolution:=optional,org.apache.commons.io.build;resolution:=optional,org.apache.commons.io.file.attribute;resolution:=optional,org.apache.commons.io.input;resolution:=optional,org.apache.commons.io.output;resolution:=optional,org.apache.commons.io;resolution:=optional,org.apache.commons.lang3.reflect;resolution:=optional,org.apache.commons.lang3;resolution:=optional,org.objectweb.asm;resolution:=optional,org.tukaani.xz;resolution:=optional"/>
   <property name="commons.osgi.private" value=""/>
   <property name="commons.osgi.symbolicName" value="org.apache.commons.compress"/>
@@ -113,7 +113,7 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-        <attribute name="Automatic-Module-Name" value="org.apache.commons.compress"/>
+        <attribute name="Automatic-Module-Name" value="${commons.osgi.symbolicName}"/>
         <attribute name="Bundle-SymbolicName" value="${commons.osgi.symbolicName}"/>
         <attribute name="Bundle-Version" value="${build.version}"/>
         <attribute name="Export-Package" value="${commons.osgi.export}"/>
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 064add6..5044958 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -33,6 +33,7 @@ Patch2:         0003-Remove-Pack200-compressor.patch
 BuildRequires:  ant
 BuildRequires:  commons-codec
 BuildRequires:  commons-io >= 2.14
+BuildRequires:  commons-lang3
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
@@ -85,7 +86,7 @@ rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java
 
 %build
 mkdir -p lib
-build-jar-repository -s lib xz-java commons-io commons-codec
+build-jar-repository -s lib xz-java commons-io commons-codec commons-lang3
 %{ant} package javadoc
 
 %install