Expand conditionals

byte-buddy.spec

@@ -1,7 +1,3 @@
-# Byte Buddy requires itself to build, so set this flag
-# to break the bootstrap cycle
-%bcond_with bootstrap
-
 Name:          byte-buddy
 Version:       1.9.5
 Release:       4%{?dist}
@@ -17,7 +13,6 @@ Patch0:         no-unixsocket.patch
 Patch1:         avoid-bundling-asm.patch
 
 BuildRequires:  maven-local
-%if %{without bootstrap}
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy-dep)
@@ -27,7 +22,6 @@ BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness
 BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.ow2.asm:asm-analysis)
 BuildRequires:  mvn(org.ow2.asm:asm-util)
-%endif
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
@@ -117,22 +111,11 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 # Plugin for generating Java 9 module-info file is not in Fedora
 %pom_remove_plugin -r :modulemaker-maven-plugin
 
-%if %{with bootstrap}
-# Remove circular self-dependency to allow bootstrapping
-%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
-%endif
-
 %build
-%if %{with bootstrap}
-# Cannot run the test suite in bootstrap mode due to circular dep
-# on self and mockito
-%mvn_build -s -f -- -P'java8,!checks'
-%else
 # Ignore test failures, there seems to be something different about the
 # bytecode of our recompiled test resources, expect 6 test failures in
 # the byte-buddy-dep module
 %mvn_build -s -- -P'java8,!checks' -Dsourcecode.test.version=1.8 -Dmaven.test.failure.ignore=true
-%endif
 
 %install
 %mvn_install