From a99d77e1f5bd157d79dc748e3b2d5d0f83d8d839 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jun 05 2018 08:40:40 +0000 Subject: Update to upstream version 1.17 --- diff --git a/.gitignore b/.gitignore index e89d4b4..0ed13ff 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ commons-compress-1.0-src.tar.gz /commons-compress-1.14-src.tar.gz /commons-compress-1.15-src.tar.gz /commons-compress-1.16.1-src.tar.gz +/commons-compress-1.17-src.tar.gz diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index f5eb099..55f7769 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,7 +2,7 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.16.1 +Version: 1.17 Release: 1%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 @@ -19,7 +19,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.objenesis:objenesis) +BuildRequires: mvn(org.osgi:org.osgi.core) BuildRequires: mvn(org.powermock:powermock-api-mockito) BuildRequires: mvn(org.powermock:powermock-module-junit4) BuildRequires: mvn(org.tukaani:xz) @@ -50,6 +50,14 @@ rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.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 + + %build %mvn_file : %{short_name} %{name} %mvn_alias : commons: @@ -65,6 +73,9 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas %doc LICENSE.txt NOTICE.txt %changelog +* Tue Jun 05 2018 Michael Simacek - 1.17-1 +- Update to upstream version 1.17 + * Mon Feb 12 2018 Michael Simacek - 1.16.1-1 - Update to upstream version 1.16.1 diff --git a/sources b/sources index 808fae8..66cff15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.16.1-src.tar.gz) = e2205b04e099c34da7e182f2b7ec66c3e05cf144018f5a4774bf61aef268286cd6ed6b7b1987090d7a046c61a77387de69b23562cda5cf1888a42b606f4f6661 +SHA512 (commons-compress-1.17-src.tar.gz) = eef0eb15b70c8aa1c1ccd67d4b50d5a94b3acf8f94b707a60abd41f3994319bd7b90402307f4be1bbfe12b34fed62aa4b8eb95e3457b9f2a7a682333f9e71e5e