From 8533c1c71f47ce8a69574138bc70c51d06efc79f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Oct 09 2012 09:08:03 +0000
Subject: Introduce nosql and osgi conditionals


- Temporarly disable osgi to bootstrap eclipse

---

diff --git a/jetty.spec b/jetty.spec
index f91521e..44c29e7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,9 +42,14 @@
 
 %global addver v20120716
 
+%if 0%{?fedora}
+%bcond_with nosql
+#%bcond_with osgi
+%endif
+
 Name:           jetty
 Version:        8.1.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -80,9 +85,11 @@ BuildRequires:  tomcat-jsp-2.2-api
 BuildRequires:  tomcat-lib
 BuildRequires:  tomcat-servlet-3.0-api
 
-%if 0%{?rhel} <= 0
+%if %{with osgi}
 BuildRequires:  eclipse-platform
 BuildRequires:  eclipse-rcp
+%endif
+%if %{with nosql}
 BuildRequires:  mongo-java-driver >= 2.6.5-4
 %endif
 
@@ -511,7 +518,7 @@ Requires:       jetty-util    = %{version}-%{release}
 %description    xml
 %{extdesc} %{summary}.
 
-%if 0%{?rhel} <= 0
+%if %{with nosql}
 %package        nosql
 Summary:        nosql module for Jetty
 Requires:       java >= 1:1.7.0
@@ -524,7 +531,9 @@ Requires:       tomcat-servlet-3.0-api
 
 %description    nosql
 %{extdesc} %{summary}.
+%endif
 
+%if %{with osgi}
 %package        osgi
 Summary:        OSGi module for Jetty
 Requires:       java >= 1:1.7.0
@@ -609,12 +618,14 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_dep org.eclipse.jetty.spdy: jetty-distribution
 %pom_xpath_remove "pom:execution[pom:id[text()='copy-spdy']]" jetty-distribution
 
-%if 0%{?rhel} > 0
 # Disable OSGi
+%if %{without osgi}
 %pom_disable_module jetty-osgi
 %pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
+%endif
 
 # Disable NoSQL
+%if %{without nosql}
 %pom_disable_module jetty-nosql
 %endif
 
@@ -724,12 +735,14 @@ for module in jetty-http-spi jetty-jaspi jetty-nested; do
     %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module
 done
 
-%if 0%{?rhel} <= 0
+%if %{with nosql}
 install -m 644 jetty-nosql/target/jetty-nosql-%{version}.%{addver}.jar \
         %{buildroot}%{_javadir}/%{name}/jetty-nosql.jar
 install -pm 644 jetty-nosql/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-nosql.pom
 %add_maven_depmap JPP.%{name}-jetty-nosql.pom %{name}/jetty-nosql.jar -f jetty-nosql
+%endif
 
+%if %{with osgi}
 pushd jetty-osgi
     install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-osgi.pom
     %add_maven_depmap JPP.%{name}-jetty-osgi.pom -f jetty-osgi
@@ -1017,12 +1030,14 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %{_mavenpomdir}/JPP.%{name}-%{name}-xml.pom
 %{_mavendepmapfragdir}/%{name}-%{name}-xml
 
-%if 0%{?rhel} <= 0
+%if %{with nosql}
 %files nosql
 %{_javadir}/%{name}/%{name}-nosql.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom
 %{_mavendepmapfragdir}/%{name}-%{name}-nosql
+%endif
 
+%if %{with osgi}
 %files osgi
 %{_javadir}/%{name}/%{name}-osgi*.jar
 %{_javadir}/%{name}/%{name}-httpservice.jar
@@ -1036,6 +1051,10 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct  9 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.5-7
+- Introduce nosql and osgi conditionals
+- Temporarly disable osgi to bootstrap eclipse
+
 * Fri Oct  5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.5-6
 - Don't delete jetty user on package erase, resolves: rhbz#857708