commit e40d73b9ffa10adacac9ad18ab7071810e457604
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 15 07:21:36 2012 +0200
Fix license tags
jetty.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 159574d..8dd3af4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -48,8 +48,8 @@ Release: 6%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
-# TODO: fix the license tag
-License: ASL 2.0
+# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
+License: ASL 2.0 or EPL
URL:
http://jetty.mortbay.org/jetty/
Source0:
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet...
Source1: djetty.script
@@ -477,6 +477,8 @@ Requires: tomcat-servlet-3.0-api
%package util
Summary: util module for Jetty
+# Utf8Appendable.java is additionally under MIT license
+License: (ASL 2.0 or EPL) and MIT
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: jetty-project = %{version}-%{release}
@@ -488,6 +490,7 @@ Requires: slf4j
%package webapp
Summary: webapp module for Jetty
+License: ASL 2.0 or EPL
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: jetty-project = %{version}-%{release}
@@ -560,6 +563,8 @@ Requires: tomcat-lib
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
+License: (ASL 2.0 or EPL) and MIT
Requires: jpackage-utils
%description javadoc
@@ -1003,6 +1008,7 @@ groupdel %username &>/dev/null || :
- Move start.ini to /etc
- Require glassfish-jsp only for jetty-webapp and jetty-osgi
- Use shadow-utils directly instead of fedora-usermgmt-devel
+- Fix license tags
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
- Don't require subpackages not needed by server itself