From 21f5f4c7df53fb0b56aeed250df1bf084668c32f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH] Expand conditionals --- maven-surefire.spec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 32be2a6..f74c258 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,4 +1,3 @@ -%bcond_without junit5 Name: maven-surefire Version: 2.22.0 @@ -50,9 +49,6 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.testng:testng) 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 Requires: procps-ng @@ -78,13 +74,6 @@ Summary: JUnit provider for Maven Surefire %description provider-junit 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 Summary: TestNG provider for Maven Surefire @@ -138,9 +127,7 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module surefire-shadefire -%if %{without junit5} %pom_disable_module surefire-junit-platform surefire-providers -%endif %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-testng -f .mfiles-testng %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin -%if %{with junit5} -%files provider-junit5 -f .mfiles-junit5 -%endif %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE cpl-v10.html