Expand conditionals

This commit is contained in:
Mikolaj Izdebski 2018-11-29 12:42:46 +00:00
parent 1e206c0fc6
commit 21f5f4c7df

View File

@ -1,4 +1,3 @@
%bcond_without junit5
Name: maven-surefire Name: maven-surefire
Version: 2.22.0 Version: 2.22.0
@ -50,9 +49,6 @@ BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
BuildRequires: mvn(org.testng:testng::jdk15:) BuildRequires: mvn(org.testng:testng::jdk15:)
%if %{with junit5}
BuildRequires: mvn(org.junit.platform:junit-platform-launcher)
%endif
# PpidChecker relies on /usr/bin/ps to check process uptime # PpidChecker relies on /usr/bin/ps to check process uptime
Requires: procps-ng Requires: procps-ng
@ -78,13 +74,6 @@ Summary: JUnit provider for Maven Surefire
%description provider-junit %description provider-junit
JUnit provider for Maven Surefire. JUnit provider for Maven Surefire.
%if %{with junit5}
%package provider-junit5
Summary: JUnit 5 provider for Maven Surefire
%description provider-junit5
JUnit 5 provider for Maven Surefire.
%endif
%package provider-testng %package provider-testng
Summary: TestNG provider for Maven Surefire Summary: TestNG provider for Maven Surefire
@ -138,9 +127,7 @@ sed -i /-Xdoclint:all/d pom.xml
%pom_disable_module surefire-shadefire %pom_disable_module surefire-shadefire
%if %{without junit5}
%pom_disable_module surefire-junit-platform surefire-providers %pom_disable_module surefire-junit-platform surefire-providers
%endif
%pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire
@ -193,9 +180,6 @@ sed -i /-Xdoclint:all/d pom.xml
%files provider-junit -f .mfiles-junit %files provider-junit -f .mfiles-junit
%files provider-testng -f .mfiles-testng %files provider-testng -f .mfiles-testng
%files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin
%if %{with junit5}
%files provider-junit5 -f .mfiles-junit5
%endif
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE cpl-v10.html %license LICENSE NOTICE cpl-v10.html