From f67cfaf312099d6b4771e07c3fcd03f3e8f68686ae258f51c20c68a772fbce26 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 26 Feb 2020 05:56:48 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=192

---
 tomcat.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomcat.changes b/tomcat.changes
index 88c1c3a..2776bec 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -5,7 +5,7 @@ Tue Feb 25 13:24:14 UTC 2020 - Fridrich Strba <fstrba@suse.com>
   http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.30_(markt)
 - Fixed CVEs:
   * CVE-2019-17569 (bsc#1164825)
-  * CVE-2020-1935
+  * CVE-2020-1935 (bsc#1164860)
   * CVE-2020-1938 (bsc#1164692)
 - Modified patch
   * tomcat-9.0.30-java8compat.patch

From 4f512b15f81eaedf8a204848cee9a1aa2274b1fb1d2c5554d0279de7fbb9e6af Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 26 Feb 2020 06:00:57 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=193

---
 tomcat.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 3ba2e78..ab0d957 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -48,7 +48,7 @@ Release:        0
 Summary:        Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API
 License:        Apache-2.0
 Group:          Productivity/Networking/Web/Servers
-URL:            http://tomcat.apache.org
+URL:            https://tomcat.apache.org
 Source0:        https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
 Source1:        %{name}-%{major_version}.%{minor_version}.conf
 Source2:        %{name}-%{major_version}.%{minor_version}.init
@@ -81,7 +81,6 @@ Patch3:         %{name}-%{major_version}.%{minor_version}-javadoc.patch
 Patch4:         tomcat-9.0-osgi-build.patch
 # PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk of using Java 9+ apis
 Patch5:         tomcat-9.0.31-java8compat.patch
-
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
 BuildRequires:  apache-commons-collections
@@ -102,6 +101,7 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  junit
 BuildRequires:  log4j12
+BuildRequires:  pkgconfig
 BuildRequires:  sed
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  unzip