Expand conditionals

junit5.spec

@@ -3,10 +3,6 @@
 %global jupiter_version %{version}
 %global vintage_version %{version}
 
-# Build with or without the console modules
-# Disabled by default due to missing dep: info.picocli:picocli
-%bcond_with console
-
 Name:           junit5
 Version:        5.4.0
 Release:        1%{?dist}
@@ -43,18 +39,8 @@ BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apiguardian:apiguardian-api)
 BuildRequires:  mvn(org.opentest4j:opentest4j)
 
-%if %{with console}
-BuildRequires:  mvn(info.picocli:picocli)
-%endif
-
 BuildRequires:  asciidoc
 
-%if %{with console}
-# Explicit requires for javapackages-tools since junit5 script
-# uses /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
-%endif
-
 %description
 JUnit is a popular regression testing framework for Java platform.
 
@@ -107,11 +93,9 @@ done
 # Incorrect scope - Junit4 is needed for compilation too, not only runtime.
 %pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine
 
-%if %{without console}
 # Disable the console modules
 %pom_disable_module junit-platform-console
 %pom_disable_module junit-platform-console-standalone
-%endif
 
 %mvn_package :aggregator __noinstall
 
@@ -126,14 +110,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %install
 %mvn_install
 
-%if %{with console}
-%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:jopt-simple %{name} true
-%endif
-
 %files -f .mfiles
-%if %{with console}
-%{_bindir}/%{name}
-%endif
 %license LICENSE.md LICENSE-notice.md
 
 %files javadoc -f .mfiles-javadoc