diff --git a/apache-commons-compress-build.xml b/apache-commons-compress-build.xml index 8f46729..4edd6dd 100644 --- a/apache-commons-compress-build.xml +++ b/apache-commons-compress-build.xml @@ -141,7 +141,7 @@ - + diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 0906589..bc37be5 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -37,7 +37,6 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: xz-java -Requires: mvn(org.tukaani:xz) Provides: %{short_name} = %{version}-%{release} Obsoletes: %{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 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 form this package. +but it has been removed from this package. %package javadoc Summary: API documentation for %{name} @@ -75,13 +74,6 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas # Restore Java 8 compatibility %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 %pom_remove_plugin :maven-javadoc-plugin