Expand conditionals

google-guice.spec

@@ -1,5 +1,3 @@
-%bcond_without jpa
-%bcond_without spring
 
 %global short_name guice
 
@@ -30,24 +28,8 @@ BuildRequires:  mvn(org.sonatype.plugins:munge-maven-plugin)
 # xmvn-builddep misses this:
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 
-%if %{with jpa}
-BuildRequires:  hibernate-jpa-2.0-api
-%endif
-%if %{with spring}
-BuildRequires:  springframework-beans
-%endif
 
 # Test dependencies:
-%if 0
-BuildRequires:  maven-surefire-provider-testng
-BuildRequires:  aqute-bnd
-BuildRequires:  atinject-tck
-BuildRequires:  easymock2
-BuildRequires:  felix-framework
-BuildRequires:  hibernate3-entitymanager
-BuildRequires:  mvn(org.hsqldb:hsqldb-j5)
-BuildRequires:  testng
-%endif
 
 %description
 Put simply, Guice alleviates the need for factories and the use of new
@@ -117,14 +99,6 @@ Summary:        MultiBindings extension module for Guice
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides MultiBindings module for Guice.
 
-%if %{with jpa}
-%package -n %{short_name}-persist
-Summary:        Persist extension module for Guice
-
-%description -n %{short_name}-persist
-Guice is a lightweight dependency injection framework for Java 5
-and above. This package provides Persist module for Guice.
-%endif
 
 %package -n %{short_name}-servlet
 Summary:        Servlet extension module for Guice
@@ -133,14 +107,6 @@ Summary:        Servlet extension module for Guice
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Servlet module for Guice.
 
-%if %{with spring}
-%package -n %{short_name}-spring
-Summary:        Spring extension module for Guice
-
-%description -n %{short_name}-spring
-Guice is a lightweight dependency injection framework for Java 5
-and above. This package provides Spring module for Guice.
-%endif
 
 %package -n %{short_name}-testlib
 Summary:        TestLib extension module for Guice
@@ -204,12 +170,8 @@ This package provides %{summary}.
 %pom_remove_parent
 %pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests
 
-%if %{without jpa}
 %pom_disable_module persist extensions
-%endif
-%if %{without spring}
 %pom_disable_module spring extensions
-%endif
 
 %pom_disable_module jdk8-tests
 
@@ -239,13 +201,7 @@ This package provides %{summary}.
 %files -n %{short_name}-jmx -f .mfiles-guice-jmx
 %files -n %{short_name}-jndi -f .mfiles-guice-jndi
 %files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
-%if %{with jpa}
-%files -n %{short_name}-persist -f .mfiles-guice-persist
-%endif
 %files -n %{short_name}-servlet -f .mfiles-guice-servlet
-%if %{with spring}
-%files -n %{short_name}-spring -f .mfiles-guice-spring
-%endif
 %files -n %{short_name}-testlib -f .mfiles-guice-testlib
 %files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders