Sync from SUSE:SLFO:Main apache-commons-compress revision 49c697c4eb950179a2dde44bde4cd150
This commit is contained in:
parent
ec55646b13
commit
7dd9e070c3
|
|
@ -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="${build.version}",org.apache.commons.compress.archivers;version="${build.version}",org.apache.commons.compress.archivers.ar;version="${build.version}",org.apache.commons.compress.archivers.arj;version="${build.version}",org.apache.commons.compress.archivers.cpio;version="${build.version}",org.apache.commons.compress.archivers.dump;version="${build.version}",org.apache.commons.compress.archivers.examples;version="${build.version}",org.apache.commons.compress.archivers.jar;version="${build.version}",org.apache.commons.compress.archivers.sevenz;version="${build.version}",org.apache.commons.compress.archivers.tar;version="${build.version}",org.apache.commons.compress.archivers.zip;version="${build.version}",org.apache.commons.compress.changes;version="${build.version}",org.apache.commons.compress.compressors;version="${build.version}",org.apache.commons.compress.compressors.bzip2;version="${build.version}",org.apache.commons.compress.compressors.deflate;version="${build.version}",org.apache.commons.compress.compressors.deflate64;version="${build.version}",org.apache.commons.compress.compressors.gzip;version="${build.version}",org.apache.commons.compress.compressors.lz4;version="${build.version}",org.apache.commons.compress.compressors.lz77support;version="${build.version}",org.apache.commons.compress.compressors.lzma;version="${build.version}",org.apache.commons.compress.compressors.lzw;version="${build.version}",org.apache.commons.compress.compressors.pack200;version="${build.version}",org.apache.commons.compress.compressors.snappy;version="${build.version}",org.apache.commons.compress.compressors.xz;version="${build.version}",org.apache.commons.compress.compressors.z;version="${build.version}",org.apache.commons.compress.harmony.archive.internal.nls;version="${build.version}",org.apache.commons.compress.harmony.pack200;version="${build.version}",org.apache.commons.compress.harmony.unpack200;version="${build.version}",org.apache.commons.compress.harmony.unpack200.bytecode;version="${build.version}",org.apache.commons.compress.harmony.unpack200.bytecode.forms;version="${build.version}",org.apache.commons.compress.java.util.jar;version="${build.version}",org.apache.commons.compress.parallel;version="${build.version}",org.apache.commons.compress.utils;version="${build.version}""/>
|
||||
<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="${build.version}",org.apache.commons.compress.archivers.arj;version="${build.version}",org.apache.commons.compress.archivers.cpio;version="${build.version}",org.apache.commons.compress.archivers.dump;version="${build.version}",org.apache.commons.compress.archivers.examples;version="${build.version}",org.apache.commons.compress.archivers.jar;version="${build.version}",org.apache.commons.compress.archivers.sevenz;version="${build.version}",org.apache.commons.compress.archivers.tar;version="${build.version}",org.apache.commons.compress.archivers.zip;version="${build.version}",org.apache.commons.compress.archivers;version="${build.version}",org.apache.commons.compress.changes;version="${build.version}",org.apache.commons.compress.compressors.bzip2;version="${build.version}",org.apache.commons.compress.compressors.deflate64;version="${build.version}",org.apache.commons.compress.compressors.deflate;version="${build.version}",org.apache.commons.compress.compressors.gzip;version="${build.version}",org.apache.commons.compress.compressors.lz4;version="${build.version}",org.apache.commons.compress.compressors.lz77support;version="${build.version}",org.apache.commons.compress.compressors.lzma;version="${build.version}",org.apache.commons.compress.compressors.lzw;version="${build.version}",org.apache.commons.compress.compressors.snappy;version="${build.version}",org.apache.commons.compress.compressors.xz;version="${build.version}",org.apache.commons.compress.compressors.z;version="${build.version}",org.apache.commons.compress.compressors;version="${build.version}",org.apache.commons.compress.java.util.jar;version="${build.version}",org.apache.commons.compress.parallel;version="${build.version}",org.apache.commons.compress.utils;version="${build.version}",org.apache.commons.compress;version="${build.version}""/>
|
||||
<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="${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}"/>
|
||||
<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:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
||||
</manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,27 @@
|
|||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 19 13:14:54 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -61,17 +62,17 @@ This package provides %{summary}.
|
|||
cp %{SOURCE1} build.xml
|
||||
|
||||
# Unavailable Google Brotli library (org.brotli.dec)
|
||||
%patch0 -p1
|
||||
%patch -P 0 -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 -P 1 -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
|
||||
%patch2 -p1
|
||||
%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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
BIN
commons-compress-1.26.0-src.tar.gz
(Stored with Git LFS)
BIN
commons-compress-1.26.0-src.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
commons-compress-1.26.1-src.tar.gz
(Stored with Git LFS)
Normal file
BIN
commons-compress-1.26.1-src.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user