Introduce groovy build conditional
This commit is contained in:
parent
f250f111a4
commit
760f6fa092
15
xbean.spec
15
xbean.spec
@ -1,11 +1,12 @@
|
||||
# Conditionals to help breaking eclipse <-> xbean dependency cycle
|
||||
# when bootstrapping for new architectures
|
||||
%bcond_without equinox
|
||||
%bcond_without groovy
|
||||
%bcond_without spring
|
||||
|
||||
Name: xbean
|
||||
Version: 4.5
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: Java plugin based web server
|
||||
License: ASL 2.0
|
||||
URL: http://geronimo.apache.org/xbean/
|
||||
@ -24,7 +25,6 @@ BuildRequires: mvn(commons-logging:commons-logging-api)
|
||||
BuildRequires: mvn(log4j:log4j:1.2.12)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
|
||||
BuildRequires: mvn(org.osgi:org.osgi.core)
|
||||
BuildRequires: mvn(org.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
@ -34,6 +34,10 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.eclipse:osgi)
|
||||
%endif
|
||||
|
||||
%if %{with groovy}
|
||||
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
|
||||
%endif
|
||||
|
||||
%if %{with spring}
|
||||
BuildRequires: mvn(ant:ant)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
@ -139,6 +143,10 @@ rm src/site/site.xml
|
||||
%pom_disable_module xbean-bundleutils
|
||||
%endif
|
||||
|
||||
%if %{without groovy}
|
||||
%pom_disable_module xbean-telnet
|
||||
%endif
|
||||
|
||||
# maven-xbean-plugin invocation makes no sense as there are no namespaces
|
||||
%pom_remove_plugin :maven-xbean-plugin xbean-classloader
|
||||
|
||||
@ -179,6 +187,9 @@ sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed Feb 1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-6
|
||||
- Introduce groovy build conditional
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5
|
||||
- Fix build with conditionals
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user