diff --git a/jetty.spec b/jetty.spec index c6c3bdc..3847048 100644 --- a/jetty.spec +++ b/jetty.spec @@ -44,7 +44,7 @@ Name: jetty Version: 8.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -588,6 +588,12 @@ find . -name "*.class" -exec rm {} \; %patch8 -p1 -b .sav %endif +# Disable SPDY for now as there are missing dependencies +# (like some TLS extensions for OpenJDK) +%pom_disable_module jetty-spdy +%pom_remove_dep org.eclipse.jetty.spdy: jetty-distribution +%pom_xpath_remove "pom:execution[pom:id[text()='copy-spdy']]" jetty-distribution + cp %{SOURCE1} djetty # this needs jetty6 things, so just remove it @@ -1008,6 +1014,9 @@ groupdel %username &>/dev/null || : %doc %{_javadocdir}/%{name} %changelog +* Wed Jul 18 2012 Mikolaj Izdebski - 8.1.4-3 +- Disable SPDY to fix FTBFS + * Wed Jun 13 2012 Stanislav Ochotnicky - 8.1.4-2 - Fix jetty being accidentaly enabled after update by default - Resolves: #831280