From c769d80a500a85c4948e8c5b2c7ad1f2a7ebd3f5da43e02cc1f450ca6eaac07a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 5 Nov 2019 13:22:49 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=3

---
 jetty-annotations.spec | 5 +----
 jetty-jndi.spec        | 5 +----
 jetty-jsp.spec         | 2 --
 jetty-minimal.spec     | 8 ++------
 jetty-plus.spec        | 2 --
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/jetty-annotations.spec b/jetty-annotations.spec
index 5cc125a..c301dd7 100644
--- a/jetty-annotations.spec
+++ b/jetty-annotations.spec
@@ -54,8 +54,7 @@ This package contains annotations module for Jetty
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
-License:        (Apache-2.0 OR EPL-1.0) AND MIT
+License:        Apache-2.0 OR EPL-1.0
 
 %description    javadoc
 %{summary}.
@@ -166,8 +165,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep -r :jetty-alpn-conscrypt-client
 rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
 
-cp %{SOURCE6} .
-
 # the default location is not allowed by SELinux
 sed -i '/<SystemProperty name="jetty.state"/d' \
     jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml
diff --git a/jetty-jndi.spec b/jetty-jndi.spec
index e1b934e..dabd0f7 100644
--- a/jetty-jndi.spec
+++ b/jetty-jndi.spec
@@ -51,8 +51,7 @@ This package contains jndi module for Jetty
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
-License:        (Apache-2.0 OR EPL-1.0) AND MIT
+License:        Apache-2.0 OR EPL-1.0
 
 %description    javadoc
 %{summary}.
@@ -161,8 +160,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep -r :jetty-alpn-conscrypt-client
 rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
 
-cp %{SOURCE6} .
-
 # the default location is not allowed by SELinux
 sed -i '/<SystemProperty name="jetty.state"/d' \
     jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml
diff --git a/jetty-jsp.spec b/jetty-jsp.spec
index 0c09204..b28ef94 100644
--- a/jetty-jsp.spec
+++ b/jetty-jsp.spec
@@ -163,8 +163,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep -r :jetty-alpn-conscrypt-client
 rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
 
-cp %{SOURCE6} .
-
 # the default location is not allowed by SELinux
 sed -i '/<SystemProperty name="jetty.state"/d' \
     jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml
diff --git a/jetty-minimal.spec b/jetty-minimal.spec
index 801b6b0..248c3da 100644
--- a/jetty-minimal.spec
+++ b/jetty-minimal.spec
@@ -125,8 +125,7 @@ License:        Apache-2.0 OR EPL-1.0
 
 %package        -n %{base_name}-util
 Summary:        util module for Jetty
-# Utf8Appendable.java is additionally under MIT license
-License:        (Apache-2.0 OR EPL-1.0) AND MIT
+License:        Apache-2.0 OR EPL-1.0
 
 %description    -n %{base_name}-util
 %{extdesc} %{summary}.
@@ -161,8 +160,7 @@ License:        Apache-2.0 OR EPL-1.0
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
-License:        (Apache-2.0 OR EPL-1.0) AND MIT
+License:        Apache-2.0 OR EPL-1.0
 
 %description    javadoc
 %{summary}.
@@ -271,8 +269,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep -r :jetty-alpn-conscrypt-client
 rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
 
-cp %{SOURCE6} .
-
 # the default location is not allowed by SELinux
 sed -i '/<SystemProperty name="jetty.state"/d' \
     jetty-home/src/main/resources/etc/jetty-started.xml
diff --git a/jetty-plus.spec b/jetty-plus.spec
index 0b67722..780ac0b 100644
--- a/jetty-plus.spec
+++ b/jetty-plus.spec
@@ -160,8 +160,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep -r :jetty-alpn-conscrypt-client
 rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
 
-cp %{SOURCE6} .
-
 # the default location is not allowed by SELinux
 sed -i '/<SystemProperty name="jetty.state"/d' \
     jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml