From ee237b5c60e33c8d8505440fe8b57a4e78143af70ffb661ffb82b74c09b8ecd2 Mon Sep 17 00:00:00 2001
From: Matei Albu <malbu@suse.com>
Date: Mon, 23 Oct 2017 12:39:41 +0000
Subject: [PATCH] Accepting request 535989 from
 home:mateialbu:branches:Java:packages

- Build with JDK 8 to fix runtime errors when running with JDK 7
  and 8
- Fix tomcat-digest classpath error (bsc#977410)
- Fix packaged /etc/alternatives symlinks for api libs that caused
  rpm -V to report link mismatch (bsc#1019016)

OBS-URL: https://build.opensuse.org/request/show/535989
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=113
---
 tomcat-8.0-digest.script |  2 +-
 tomcat.changes           |  9 +++++++++
 tomcat.spec              | 21 +++++----------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/tomcat-8.0-digest.script b/tomcat-8.0-digest.script
index e4dcbf7..1a1f9b9 100644
--- a/tomcat-8.0-digest.script
+++ b/tomcat-8.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 servlet tomcat/tomcat-util tomcat/api"
 
 # Set parameters
 set_classpath $BASE_JARS
diff --git a/tomcat.changes b/tomcat.changes
index 9c5ebd9..a1f2600 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com
+
+- Build with JDK 8 to fix runtime errors when running with JDK 7 
+  and 8
+- Fix tomcat-digest classpath error (bsc#977410)
+- Fix packaged /etc/alternatives symlinks for api libs that caused
+  rpm -V to report link mismatch (bsc#1019016) 
+
 -------------------------------------------------------------------
 Mon Oct 23 06:07:05 UTC 2017 - ecsos@opensuse.org
 
diff --git a/tomcat.spec b/tomcat.spec
index 00584be..5435a49 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -93,7 +93,7 @@ BuildRequires:  geronimo-jaxrpc-1_1-api
 BuildRequires:  geronimo-qname-1_1-api
 BuildRequires:  geronimo-saaj-1_1-api
 BuildRequires:  jakarta-taglibs-standard >= 1.1
-BuildRequires:  java-devel >= 1.7.0
+BuildRequires:  java-devel = 1.8.0
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -564,17 +564,6 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
 #bnc#565901
 ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
 
-# Install update-alternatives content
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar
-ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar
-touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar
-ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar
-touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar
-ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar
-touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar
-ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
-
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
 f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
@@ -716,8 +705,8 @@ rm -f \
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
 %endif
-%{_javadir}/el_1_0_api.jar
-%{_javadir}/el_api.jar
+%ghost %{_javadir}/el_1_0_api.jar
+%ghost %{_javadir}/el_api.jar
 %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
 %ghost %{_sysconfdir}/alternatives/el_api.jar
 
@@ -727,7 +716,7 @@ rm -f \
 %files jsp-2_3-api
 %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 %{_javadir}/%{name}-jsp-api.jar
-%{_javadir}/jsp.jar
+%ghost %{_javadir}/jsp.jar
 %ghost %{_sysconfdir}/alternatives/jsp.jar
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
 %if %{defined _maven_repository}
@@ -776,7 +765,7 @@ rm -f \
 %doc LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar
-%{_javadir}/servlet.jar
+%ghost %{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet.jar
 %if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-servlet-api