drop BuildRequires: powermock

This commit is contained in:
Fabio Valentini 2019-08-14 15:59:27 +02:00
parent 45f2877579
commit b83cadbdd7
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
2 changed files with 14 additions and 4 deletions

6
.gitignore vendored
View File

@ -1,4 +1,7 @@
commons-compress-1.0-src.tar.gz
/results_*
/*.src.rpm
/commons-compress-1.0-src.tar.gz
/commons-compress-1.1-src.tar.gz
/commons-compress-1.2-src.tar.gz
/commons-compress-1.3-src.tar.gz
@ -18,3 +21,4 @@ commons-compress-1.0-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
/commons-compress-1.18-src.tar.gz

View File

@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.18
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Java API for working with compressed files and archivers
License: ASL 2.0
URL: http://commons.apache.org/proper/commons-compress/
@ -20,9 +20,8 @@ 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.mockito:mockito-core)
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)
%description
@ -61,6 +60,10 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas
%pom_remove_dep :slf4j-api::test
rm src/test/java/org/apache/commons/compress/OsgiITest.java
# Remove test that requires powermock
%pom_remove_dep org.powermock:
%pom_add_dep org.mockito:mockito-core::test
rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
%build
%mvn_file : %{short_name} %{name}
@ -77,6 +80,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java
%doc LICENSE.txt NOTICE.txt
%changelog
* Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-6
- Remove build-dependency on powermock
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild