[jetty] Update to upstream version 9.1.1

[Michael Šimáček]

commit 3646000d36dd7a3903589b5c3440a5eaac9f491b
Author: Michael Simacek <msimacek at redhat.com>
Date:   Sat Jan 11 17:10:35 2014 +0100

    Update to upstream version 9.1.1

 .gitignore |    1 +
 jetty.spec |   23 ++++++++++++++++-------
 sources    |    2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index efb9ea7..61ecf06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ jetty-6.1.26-src.zip
 /jetty-9.0.5.v20130815.tar.gz
 /jetty-9.0.6.v20130930.tar.gz
 /jetty-9.1.0.v20131115.tar.gz
+/jetty-9.1.1.v20140108.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 6a6e879..b66ff99 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver v20131115
+%global addver v20140108
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -54,8 +54,8 @@
 %endif
 
 Name:           jetty
-Version:        9.1.0
-Release:        4%{?dist}
+Version:        9.1.1
+Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -420,19 +420,19 @@ Summary:        websocket-servlet module for Jetty
 Summary:        websocket-mux-extension module for Jetty
 
 %description    websocket-mux-extension
-%{extedesc} %{summary}.
+%{extdesc} %{summary}.
 
 %package        javax-websocket-client-impl
 Summary:        javax-websocket-client-impl module for Jetty
 
 %description    javax-websocket-client-impl
-%{extedesc} %{summary}.
+%{extdesc} %{summary}.
 
 %package        javax-websocket-server-impl
 Summary:        javax-websocket-server-impl module for Jetty
 
 %description    javax-websocket-server-impl
-%{extedesc} %{summary}.
+%{extdesc} %{summary}.
 
 %if %{with nosql}
 %package        nosql
@@ -518,6 +518,10 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_plugin ":clirr-maven-plugin" jetty-websocket
 %pom_remove_plugin ":maven-eclipse-plugin" jetty-osgi
 
+# it tries to execute start.jar, but can't find its config that wasn't
+# installed yet
+%pom_remove_plugin ":exec-maven-plugin" jetty-distribution
+
 # Disable test and example artifacts
 # they need more dependencies then we have time for right now :-)
 # and also xmvn currently doesn't support .war
@@ -642,11 +646,12 @@ cp %{SOURCE5} %{buildroot}%{_unitdir}/
 # main pkg
 tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir}
 mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/
-rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version}
+rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
 rm -f %{buildroot}%{homedir}/bin/*cygwin*
 
 # copy previously extracted configuration
 cp jetty-distribution/target/distribution/etc/* %{buildroot}%{homedir}/etc/
+cp jetty-distribution/target/distribution/modules/* %{buildroot}%{homedir}/modules/
 
 chmod +x djetty
 mv djetty %{buildroot}%{_bindir}/djetty
@@ -839,6 +844,10 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Fri Jan 10 2014 Michael Simacek <msimacek at redhat.com> - 9.1.1-1
+- Update to upstream version 9.1.1
+- Install .mod files
+
 * Thu Dec 19 2013 Michael Simacek <msimacek at redhat.com> - 9.1.0-4
 - Add missing BD on ecj
 
diff --git a/sources b/sources
index 69e085e..2bd52ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c28c640ed6d883f270def8a9bb692fff  jetty-9.1.0.v20131115.tar.gz
+4683544a637abdce1d68071f0d3ed96e  jetty-9.1.1.v20140108.tar.gz