[jetty] Add missing BR: maven-plugin-build-helper

[Michal Srb]

commit a96968dc5e46926c1d1d10031d72d81c5e9c1508
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jun 26 10:17:56 2013 +0200

    Add missing BR: maven-plugin-build-helper
    
    - Add MIT license text
    - Don't install CDDL license
    - More specific explanation why tests are disabled

 LICENSE-MIT |   10 ++++++++++
 jetty.spec  |   26 ++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..30a4628
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,10 @@
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern at hoehrmann.de>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jetty.spec b/jetty.spec
index 73c13b9..6a8a2cf 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,10 +55,9 @@
 
 Name:           jetty
 Version:        9.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java Webserver and Servlet Container
 
-Group:          Applications/Internet
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
 License:        ASL 2.0 or EPL
 URL:            http://www.eclipse.org/jetty/
@@ -66,6 +65,8 @@ Source0:        http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/sna
 Source1:        djetty.script
 Source3:        jetty.logrotate
 Source5:        %{name}.service
+# MIT license text taken from Utf8Appendable.java
+Source6:        LICENSE-MIT
 Patch0:         %{name}-create-work-dir.patch
 Patch4:         0004-Modify-dependencies.patch
 
@@ -93,6 +94,7 @@ BuildRequires:  slf4j
 BuildRequires:  systemd-units
 BuildRequires:  tomcat-lib
 BuildRequires:  geronimo-parent-poms
+BuildRequires:  maven-plugin-build-helper
 
 %if %{with osgi}
 BuildRequires:  eclipse-platform
@@ -549,11 +551,11 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_dep :org.eclipse.jdt.core jetty-jsp
 
 cp %{SOURCE1} djetty
+cp %{SOURCE6} .
 
-
-iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \
-      LICENSE-CONTRIBUTOR/CDDLv1.0.txt.con
-mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
+# Looks like all CDDL licensed content in tarball has been replaced,
+# we don't need to install this license
+rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
 
 %build
 sed -i -e "s|/usr/share|%{_datadir}|g" djetty
@@ -563,6 +565,7 @@ sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 %mvn_package :jetty-project project
 
 # we don't have all necessary dependencies to run tests
+# missing test dep: org.eclipse.jetty.toolchain:jetty-test-helper
 %mvn_build -f -s
 
 cd jetty-distribution
@@ -733,11 +736,11 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %{appdir}
 %{_unitdir}/%{name}.service
 %endif # with service
-%doc NOTICE.txt README.txt VERSION.txt LICENSE*
+%doc NOTICE.txt README.txt VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
 %dir %{_javadir}/%{name}
 
 %files project -f .mfiles-project
-%doc NOTICE.txt README.txt VERSION.txt LICENSE*
+%doc NOTICE.txt README.txt VERSION.txt LICENSE-eplv10-aslv20.html LICENSE-CONTRIBUTOR
 
 %files annotations -f .mfiles-jetty-annotations
 %files ant -f .mfiles-jetty-ant
@@ -764,6 +767,7 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %files servlets -f .mfiles-jetty-servlets
 %files start -f .mfiles-jetty-start
 %files util -f .mfiles-jetty-util
+%doc LICENSE-MIT
 %files util-ajax -f .mfiles-jetty-util-ajax
 %files webapp -f .mfiles-jetty-webapp
 %files xml -f .mfiles-jetty-xml
@@ -796,6 +800,12 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Wed Jun 26 2013 Michal Srb <msrb at redhat.com> - 9.0.3-4
+- Add missing BR: maven-plugin-build-helper
+- Add MIT license text
+- Don't install CDDL license
+- More specific explanation why tests are disabled
+
 * Wed May 29 2013 Michal Srb <msrb at redhat.com> - 9.0.3-3
 - Add description for jetty-util