Fix bootstrap

This commit is contained in:
Mikolaj Izdebski 2022-01-27 17:20:41 +01:00
parent 417141168e
commit d7fe8e444a

View File

@ -2,7 +2,7 @@
Name: mockito Name: mockito
Version: 3.12.4 Version: 3.12.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: Tasty mocking framework for unit tests in Java Summary: Tasty mocking framework for unit tests in Java
License: MIT License: MIT
URL: https://site.mockito.org/ URL: https://site.mockito.org/
@ -61,12 +61,14 @@ Requires: %{name} = %{version}-%{release}
Mockito preconfigured inline mock maker (intermediate and to be Mockito preconfigured inline mock maker (intermediate and to be
superseded by automatic usage in a future version). superseded by automatic usage in a future version).
%if %{without bootstrap}
%package junit-jupiter %package junit-jupiter
Summary: Mockito JUnit 5 support Summary: Mockito JUnit 5 support
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description junit-jupiter %description junit-jupiter
Mockito JUnit 5 support. Mockito JUnit 5 support.
%endif
%prep %prep
%autosetup -p1 %autosetup -p1
@ -121,6 +123,7 @@ cd -
%mvn_artifact %{SOURCE3} target/mockito-inline.jar %mvn_artifact %{SOURCE3} target/mockito-inline.jar
%mvn_package org.mockito:mockito-inline inline %mvn_package org.mockito:mockito-inline inline
%if %{without bootstrap}
# Build the junit-jupiter subproject # Build the junit-jupiter subproject
cd subprojects/junit-jupiter cd subprojects/junit-jupiter
mkdir -p target/classes/ mkdir -p target/classes/
@ -135,6 +138,7 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \
target/mockito-junit-jupiter.unwrapped.jar target/mockito-junit-jupiter.unwrapped.jar
%mvn_artifact %{SOURCE4} target/mockito-junit-jupiter.jar %mvn_artifact %{SOURCE4} target/mockito-junit-jupiter.jar
%mvn_package org.mockito:mockito-junit-jupiter junit-jupiter %mvn_package org.mockito:mockito-junit-jupiter junit-jupiter
%endif
%install %install
%mvn_install %mvn_install
@ -145,12 +149,17 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \
%files inline -f .mfiles-inline %files inline -f .mfiles-inline
%if %{without bootstrap}
%files junit-jupiter -f .mfiles-junit-jupiter %files junit-jupiter -f .mfiles-junit-jupiter
%endif
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE %license LICENSE
%changelog %changelog
* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.4-2
- Don't build mockito-junit-jupiter in bootstrap mode
* Sat Jan 22 2022 Jerry James <loganjerry@gmail.com> - 3.12.4-1 * Sat Jan 22 2022 Jerry James <loganjerry@gmail.com> - 3.12.4-1
- Version 3.12.4 - Version 3.12.4
- Add inline and junit-jupiter subpackages - Add inline and junit-jupiter subpackages