Fridrich Strba 2021-07-19 15:02:32 +00:00 committed by Git OBS Bridge
parent d99e1af962
commit 8c4d0d4ea0
2 changed files with 2 additions and 10 deletions

View File

@ -141,7 +141,7 @@
<attribute name="Implementation-Vendor-Id" value="org.apache"/> <attribute name="Implementation-Vendor-Id" value="org.apache"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
<attribute name="Implementation-Version" value="${build.version}"/> <attribute name="Implementation-Version" value="${build.version}"/>
<attribute name="Import-Package" value="org.tukaani.xz;resolution:=optional,org.objectweb.asm;resolution:=optional,javax.crypto;resolution:=optional,javax.crypto.spec;resolution:=optional,org.brotli.dec;resolution:=optional,com.github.luben.zstd;resolution:=optional"/> <attribute name="Import-Package" value="org.tukaani.xz;resolution:=optional,org.objectweb.asm;resolution:=optional,javax.crypto;resolution:=optional,javax.crypto.spec;resolution:=optional"/>
<attribute name="Include-Resource" value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/> <attribute name="Include-Resource" value="META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LICENSE.txt"/>
<attribute name="Main-Class" value="org.apache.commons.compress.archivers.Lister"/> <attribute name="Main-Class" value="org.apache.commons.compress.archivers.Lister"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/> <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>

View File

@ -37,7 +37,6 @@ BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: xz-java BuildRequires: xz-java
Requires: mvn(org.tukaani:xz)
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} < %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release}
@ -48,7 +47,7 @@ BuildArch: noarch
The Apache Commons Compress library defines an API for working with The Apache Commons Compress library defines an API for working with
ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files. 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, In version 1.14 read-only support for Brotli decompression has been added,
but it has been removed form this package. but it has been removed from this package.
%package javadoc %package javadoc
Summary: API documentation for %{name} Summary: API documentation for %{name}
@ -75,13 +74,6 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas
# Restore Java 8 compatibility # Restore Java 8 compatibility
%patch2 -p1 %patch2 -p1
# 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 # NPE with jdk10
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-javadoc-plugin