commit 6c05f9a6c84755caf91775edf128484f09063719 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Tue Aug 7 07:58:13 2012 +0200

Fix patch for disabling OSGi

This fixes FTBFS.

0007-disable-jetty-osgi.patch | 73 ----------------------------------------- jetty.spec | 13 ++++++- 2 files changed, 11 insertions(+), 75 deletions(-) --- diff --git a/jetty.spec b/jetty.spec index d564939..fe1f52b 100644 --- a/jetty.spec +++ b/jetty.spec @@ -62,7 +62,6 @@ Patch3: 0003-Change-servelt-groupId-to-javax.servlet.patch 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

BuildRequires: geronimo-annotation BuildRequires: geronimo-jaspic-spec @@ -583,9 +582,18 @@ find . -name "*.class" -exec rm {} ; %patch5 -p1 -b .sav %patch6 -p1 -b .sav %if 0%{?rhel} > 0 -%patch7 -p1 -b .sav +%pom_disable_module jetty-osgi +%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]" %endif

+%pom_remove_dep :org.eclipse.jdt.core jetty-jsp +%pom_xpath_inject "pom:project/pom:dependencies" " + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>2.2.3</version> + </dependency>" jetty-jsp + cp %{SOURCE1} djetty

# this needs jetty6 things, so just remove it @@ -1007,6 +1015,7 @@ groupdel %username &>/dev/null || : %changelog * Tue Aug 7 2012 Mikolaj Izdebski mizdebsk@redhat.com - 8.1.2-10 - Put runtime data in /run instead of /tmp +- Fix patch for disabling OSGi

* Wed Jun 13 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 8.1.2-9 - Fix jetty being accidentaly enabled after update by default