diff --git a/jetty.spec b/jetty.spec index 86a3278..f1d08fb 100644 --- a/jetty.spec +++ b/jetty.spec @@ -48,6 +48,7 @@ %if 0%{?fedora} %bcond_without nosql %bcond_without osgi +%bcond_without spring # package without service files %bcond_without service %endif @@ -91,7 +92,6 @@ BuildRequires: objectweb-asm BuildRequires: slf4j BuildRequires: systemd-units BuildRequires: tomcat-lib -BuildRequires: springframework-beans BuildRequires: geronimo-parent-poms %if %{with osgi} @@ -101,6 +101,9 @@ BuildRequires: eclipse-rcp %if %{with nosql} BuildRequires: mongo-java-driver >= 2.6.5-4 %endif +%if %{with spring} +BuildRequires: springframework-beans +%endif BuildRequires: javamail BuildRequires: jetty-parent @@ -319,11 +322,13 @@ Summary: servlets module for Jetty %description servlets %{extdesc} %{summary}. +%if %{with spring} %package spring Summary: spring module for Jetty %description spring %{extdesc} %{summary}. +%endif %package start Summary: start module for Jetty @@ -524,6 +529,11 @@ find . -name "*.class" -exec rm {} \; %pom_disable_module jetty-nosql %endif +# Disable Spring +%if %{without spring} +%pom_disable_module jetty-spring +%endif + %pom_remove_dep :org.eclipse.jdt.core jetty-jsp cp %{SOURCE1} djetty @@ -740,7 +750,6 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %files server -f .mfiles-jetty-server %files servlet -f .mfiles-jetty-servlet %files servlets -f .mfiles-jetty-servlets -%files spring -f .mfiles-jetty-spring %files start -f .mfiles-jetty-start %files util -f .mfiles-jetty-util %files util-ajax -f .mfiles-jetty-util-ajax @@ -766,12 +775,17 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %files osgi-npn -f .mfiles-jetty-osgi-npn %endif +%if %{with spring} +%files spring -f .mfiles-jetty-spring +%endif + %files javadoc -f .mfiles-javadoc %doc NOTICE.txt LICENSE* %changelog * Thu Apr 18 2013 Mikolaj Izdebski - 9.0.0-3 - Remove maven-license-plugin +- Conditionally disable jetty-spring * Wed Apr 10 2013 Michal Srb - 9.0.0-2 - Replace tomcat libs with glassfish libs