From 51a3eaf0883673bbf08fa91dd6a998f0105466b0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: May 24 2012 12:14:24 +0000
Subject: Add patch to disable jetty-nosql


---

diff --git a/0008-Disable-jetty-nosql.patch b/0008-Disable-jetty-nosql.patch
new file mode 100644
index 0000000..bc8a0e4
--- /dev/null
+++ b/0008-Disable-jetty-nosql.patch
@@ -0,0 +1,24 @@
+From 7a6b4a3722c778cc5d0651afb8a50811deec8e15 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 24 May 2012 13:39:02 +0200
+Subject: [PATCH 8/8] Disable jetty-nosql
+
+---
+ pom.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 65abba7..ec3c277 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -352,7 +352,6 @@
+     <module>jetty-start</module>
+     <module>jetty-nested</module>
+     <module>jetty-overlay-deployer</module>
+-    <module>jetty-nosql</module>
+     <module>jetty-http-spi</module>
+     <module>jetty-jsp</module>
+     <module>jetty-distribution</module>
+-- 
+1.7.7.6
+
diff --git a/jetty.spec b/jetty.spec
index 1ea11ec..d637051 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
 
 Name:           jetty
 Version:        8.1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -63,6 +63,7 @@ Patch4:         0004-Modify-dependencies.patch
 Patch5:         0005-Remove-pmd-plugin.patch
 Patch6:         0006-Remove-unpack-config-deps-from-distribution.patch
 Patch7:         0007-disable-jetty-osgi.patch
+Patch8:         0008-Disable-jetty-nosql.patch
 
 BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
@@ -584,6 +585,7 @@ find . -name "*.class" -exec rm {} \;
 %patch6 -p1 -b .sav
 %if 0%{?rhel} > 0
 %patch7 -p1 -b .sav
+%patch8 -p1 -b .sav
 %endif
 
 cp %{SOURCE1} djetty
@@ -676,7 +678,7 @@ done
 
 # modules used during build and other jars not included in the
 # distribution tarball
-for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do
+for module in jetty-http-spi jetty-jaspi jetty-nested; do
     install -m 644 $module/target/$module-%{version}.%{addver}.jar \
            %{buildroot}%{_javadir}/%{name}/$module.jar
     install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
@@ -684,6 +686,11 @@ for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do
 done
 
 %if 0%{?rhel} <= 0
+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
+
 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
@@ -1004,6 +1011,9 @@ groupdel %username &>/dev/null || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu May 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.2-9
+- Add patch to disable jetty-nosql
+
 * Wed May 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.2-8
 - Build jetty-nosql conditionally