From 12818627366f3b0f7a54b00bc8f013ecce75cfc701ba41566f0394105b0390f1 Mon Sep 17 00:00:00 2001
From: Matei Albu <malbu@suse.com>
Date: Fri, 11 Jan 2019 16:11:31 +0000
Subject: [PATCH] Accepting request 664712 from
 home:mateialbu:branches:Java:packages

- Fix tomcat-digest classpath error (bsc#1120745)

OBS-URL: https://build.opensuse.org/request/show/664712
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=141
---
 tomcat-9.0-digest.script | 2 +-
 tomcat.changes           | 5 +++++
 tomcat.spec              | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tomcat-9.0-digest.script b/tomcat-9.0-digest.script
index e4dcbf7..fae10b3 100644
--- a/tomcat-9.0-digest.script
+++ b/tomcat-9.0-digest.script
@@ -34,7 +34,7 @@ export CLASSPATH
 MAIN_CLASS="org.apache.catalina.startup.Tool"
 BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
 BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat/catalina servlet"
+BASE_JARS="commons-daemon tomcat/catalina tomcat/servlet"
 
 # Set parameters
 set_classpath $BASE_JARS
diff --git a/tomcat.changes b/tomcat.changes
index d82f2c4..d475366 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 11 15:46:43 UTC 2019 - malbu@suse.com
+
+- Fix tomcat-digest classpath error (bsc#1120745) 
+
 -------------------------------------------------------------------
 Sat Dec 29 10:08:17 UTC 2018 - ecsos@opensuse.org
 
diff --git a/tomcat.spec b/tomcat.spec
index 9674003..9f64f89 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -45,7 +45,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:            http://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