diff --git a/jetty.spec b/jetty.spec index 51578c6..770bf21 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.18 -Release: 2%{addver}%{?dist} +Release: 3%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -294,7 +294,7 @@ Obsoletes: %{name}-httpservice < 9.4.18-1 %package util Summary: util module for Jetty # Utf8Appendable.java is additionally under MIT license -License: (ASL 2.0 or EPL) and MIT +License: (ASL 2.0 or EPL-1.0) and MIT %description util %{extdesc} %{summary}. @@ -545,7 +545,7 @@ Summary: jstl module for Jetty %package javadoc Summary: Javadoc for %{name} # some MIT-licensed code (from Utf8Appendable) is used to generate javadoc -License: (ASL 2.0 or EPL) and MIT +License: (ASL 2.0 or EPL-1.0) and MIT %description javadoc %{summary}. @@ -931,6 +931,9 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %changelog +* Tue Jun 11 2019 Mat Booth - 9.4.18-3.v20190429 +- Fix license tags + * Fri May 03 2019 Mat Booth - 9.4.18-2.v20190429 - Remove dep on Eclipse since it's not available on all platforms, and don't ship OSGi modules