From 6583782d6db002a7635ddd768acdcdcc61c7adba Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Thu, 13 Jun 2024 10:33:56 +0800 Subject: [PATCH] License compliance rectification (cherry picked from commit f39243b0253a9eb28bdd59bc582dfc6d67adb712) --- jetty.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jetty.spec b/jetty.spec index 91c7e6e..cb91c66 100644 --- a/jetty.spec +++ b/jetty.spec @@ -12,9 +12,9 @@ %bcond_with jp_minimal Name: jetty Version: 9.4.16 -Release: 4 +Release: 5 Summary: Java Webserver and Servlet Container -License: ASL 2.0 or EPL-1.0 or EPL-2.0 +License: (Apache-2.0 OR EPL-1.0) and MIT URL: http://www.eclipse.org/jetty/ Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz Source1: jetty.sh @@ -216,7 +216,7 @@ Summary: servlet module for Jetty %package util Summary: util module for Jetty -License: (ASL 2.0 or EPL) and MIT +License: (Apache-2.0 OR EPL-1.0) and MIT %description util %{extdesc} %{summary}. @@ -458,7 +458,7 @@ Summary: jstl module for Jetty %package javadoc Summary: Javadoc for %{name} -License: (ASL 2.0 or EPL) and MIT +License: (Apache-2.0 OR EPL-1.0) and MIT %description javadoc %{summary}. @@ -796,6 +796,9 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %changelog +* Thu Jun 13 2024 yao_xin - 9.4.16-5 +- License compliance rectification + * Mon May 29 2023 yaoxin - 9.4.16-4 - Fix eclipse-jgit build failure in EBS -- Gitee