[jetty] Update to upstream version 8.1.5

[Mikolaj Izdebski]

commit a690da8df734bc97d588c3f8667c0bcab797e9c9
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jul 19 01:14:38 2012 +0200

    Update to upstream version 8.1.5
    
    Also fix rpmlint warnings.

 jetty.spec |   34 +++++++++++++++++-----------------
 sources    |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 68bf1f2..444d62a 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,11 +40,11 @@
 %global jettylibdir %{_localstatedir}/lib/%{name}
 %global appdir      %{jettylibdir}/webapps
 
-%global addver v20120524
+%global addver v20120716
 
 Name:           jetty
-Version:        8.1.4
-Release:        3%{?dist}
+Version:        8.1.5
+Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -122,17 +122,13 @@ Requires:       jetty-util             = %{version}-%{release}
 Requires:       jetty-webapp           = %{version}-%{release}
 Requires:       jetty-websocket        = %{version}-%{release}
 Requires:       jetty-xml              = %{version}-%{release}
-
-
 # These are not required by main jetty server so we don't require them
-# in RPM. Install as necessary
-# Requires:       jetty-http-spi         = %{version}-%{release}
-# Requires:       jetty-jaspi            = %{version}-%{release}
-# Requires:       jetty-nested           = %{version}-%{release}
-# %if 0%{?rhel} <= 0
-# Requires:       jetty-nosql            = %{version}-%{release}
-# Requires:       jetty-osgi             = %{version}-%{release}
-# %endif
+# in RPM. Install as necessary:
+#  * jetty-http-spi
+#  * jetty-jaspi
+#  * jetty-nested
+#  * jetty-nosql
+#  * jetty-osgi
 
 Requires(pre):    shadow-utils
 Requires(post):   systemd-units, systemd-sysv
@@ -640,9 +636,9 @@ iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \
 mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
 
 %build
-#rm -rf ./*
-#ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* .
-#exit 0
+: rm -rf ./*
+: ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* .
+: exit 0
 # remove previous lines!
 sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 
@@ -865,7 +861,7 @@ if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
 fi
-# Remove the user even during upgrade, it will be added later in %post.
+# Remove the user even during upgrade, it will be added later in %%post.
 # This is required to force incorrect UID to be replaced with the new one.
 userdel  %username &>/dev/null || :
 groupdel %username &>/dev/null || :
@@ -1049,6 +1045,10 @@ groupdel %username &>/dev/null || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 18 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.5-1
+- Update to upstream version 8.1.5
+- Fix rpmlint warnings
+
 * Wed Jul 18 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.4-3
 - Disable SPDY to fix FTBFS
 
diff --git a/sources b/sources
index 84f277a..1dc0066 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0718c624b2e7516d45369e1a60d6914a  jetty-8.1.4.v20120524.tar.bz2
+5192ef96acd9226ee8f3fa2cde6dbb29  jetty-8.1.5.v20120716.tar.bz2