From 68d703fd218a59637b070e2689792bf2c344cb63 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Aug 14 2017 08:35:51 +0000 Subject: Add license and provides for bundled mockito --- diff --git a/powermock.spec b/powermock.spec index 7a3b156..5b306c2 100644 --- a/powermock.spec +++ b/powermock.spec @@ -1,8 +1,9 @@ Name: powermock Version: 1.6.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Java mocking framework +# Note: api-mockito subpackage is ASL 2.0 and MIT, the rest is ASL 2.0 License: ASL 2.0 URL: https://github.com/jayway/powermock Source0: https://github.com/jayway/%{name}/archive/%{name}-%{version}.tar.gz @@ -86,6 +87,9 @@ This package contains support code for the PowerMock API extensions. %package api-mockito Summary: PowerMock Mockito API module +# Bundles forked mockito, which is under MIT +License: ASL 2.0 and MIT +Provides: bundled(mockito) = 2.0 Requires: %{name}-common = %{version}-%{release} %description api-mockito @@ -191,6 +195,7 @@ sed -i '/shouldLoadClassAndOverrideMethodGreaterThanJvmLimit/i@org.junit.Ignore' %files junit4 -f .mfiles-junit4 %files api-support -f .mfiles-api-support %files api-mockito -f .mfiles-api-mockito +%license api/mockito2/src/main/java/org/powermock/api/mockito/repackaged/Mockito-LICENSE.txt %files api-easymock -f .mfiles-api-easymock %files testng -f .mfiles-testng @@ -198,6 +203,9 @@ sed -i '/shouldLoadClassAndOverrideMethodGreaterThanJvmLimit/i@org.junit.Ignore' %license LICENSE.txt %changelog +* Thu Aug 10 2017 Michael Simacek - 1.6.5-7 +- Add license and provides for bundled mockito + * Thu Jul 27 2017 Fedora Release Engineering - 1.6.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild