Expand conditionals
This commit is contained in:
parent
e268bb34da
commit
324cd2d0d7
@ -1,6 +1,3 @@
|
||||
# Optionally build with a reduced dependency set
|
||||
%bcond_with jp_minimal
|
||||
|
||||
Name: osgi-compendium
|
||||
Version: 7.0.0
|
||||
Release: 2%{?dist}
|
||||
@ -13,10 +10,6 @@ Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
%if %{without jp_minimal}
|
||||
BuildRequires: mvn(javax.persistence:persistence-api)
|
||||
BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) >= 2.1.5-2
|
||||
%endif
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.osgi:osgi.annotation)
|
||||
BuildRequires: mvn(org.osgi:osgi.core)
|
||||
@ -70,15 +63,10 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
|
||||
%pom_add_dep org.osgi:osgi.annotation::provided
|
||||
%pom_add_dep org.osgi:osgi.core::provided
|
||||
%pom_add_dep javax.servlet:javax.servlet-api::provided
|
||||
%if %{without jp_minimal}
|
||||
%pom_add_dep javax.persistence:persistence-api::provided
|
||||
%pom_add_dep javax.ws.rs:javax.ws.rs-api::provided
|
||||
%else
|
||||
# Don't compile in Jax RS and JPA support when jp_minimal is activated
|
||||
rm -r src/main/java/org/osgi/service/jaxrs
|
||||
rm -r src/main/java/org/osgi/service/jpa
|
||||
rm -r src/main/java/org/osgi/service/transaction/control/jpa
|
||||
%endif
|
||||
|
||||
%build
|
||||
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
|
||||
|
Loading…
Reference in New Issue
Block a user