From a14e7a9e0d91fd8c2e6cb44e35c1743b2dfc59b11949580e95ef4b66917b485f Mon Sep 17 00:00:00 2001
From: Matei Albu <malbu@suse.com>
Date: Mon, 2 Nov 2020 16:37:37 +0000
Subject: [PATCH] Accepting request 845377 from
 home:mateialbu:branches:Java:packages

- Fix tomcat-servlet-4_0-api package alternatives to use /usr/share/java/servlet.jar instead of  /usr/share/java/tomcat-servlet.jar. Keep /usr/share/java/tomcat-servlet.jar symlink for compatibility (bsc#1092163)
- Change default file ownership in tomcat-webapps from
  tomcat:tomcat to root:tomcat

OBS-URL: https://build.opensuse.org/request/show/845377
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=211
---
 tomcat.changes | 10 ++++++++++
 tomcat.spec    | 25 ++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/tomcat.changes b/tomcat.changes
index 35efca1..43451a9 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Oct 30 17:05:52 UTC 2020 - Matei Albu <malbu@suse.com>
+
+- Fix tomcat-servlet-4_0-api package alternatives to use
+  /usr/share/java/servlet.jar instead of /usr/share/java/tomcat-servlet.jar.
+  Keep /usr/share/java/tomcat-servlet.jar symlink for compatibility. 
+  (bsc#1092163) 
+- Change default file ownership in tomcat-webapps from 
+  tomcat:tomcat to root:tomcat
+
 -------------------------------------------------------------------
 Tue Oct 13 11:23:32 UTC 2020 - Matei Albu <malbu@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 562bad2..455b6af 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -418,6 +418,7 @@ pushd %{buildroot}%{_javadir}
    ln -s %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar
    mv %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar
    ln -s %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar
+   ln -s %{name}-servlet-%{servletspec}-api.jar %{name}-servlet.jar
    mv %{name}/el-api.jar %{name}-el-%{elspec}-api.jar
    ln -s %{name}-el-%{elspec}-api.jar %{name}-el-api.jar
 popd
@@ -572,7 +573,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar
 ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/%{name}-el_1_0_api.jar
 ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar
-ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar
+# To avoid conflicts with servletapi4 and servletapi5 create a link to incorrect /etc/alternatives/servlet.jar.
+# It will be changed anyways to the correct symlink by update-alternatives.
+ln -s -f %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
 
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
@@ -639,11 +642,26 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %post servlet-4_0-api
-update-alternatives --install %{_javadir}/%{name}-servlet.jar servlet \
+update-alternatives --install %{_javadir}/servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
+# Fix for bsc#1092163.
+# Keep the /usr/share/java/tomcat-servlet.jar symlink for compatibility.
+# In case of update from an older version where /usr/share/java/tomcat-servlet.jar is an alternatives symlink 
+# the update-alternatives in the new version will cause a rename tomcat-servlet.jar -> servlet.jar.
+# This makes sure the tomcat-servlet.jar is recreated if it's missing because of the rename.
+if [ ! -f %{_javadir}/%{name}-servlet.jar ]; then 
+    echo "Recreating symlink %{_javadir}/%{name}-servlet.jar"
+    ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet.jar
+fi
 
 %postun servlet-4_0-api
 if [ $1 -eq 0 ] ; then
+    if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then 
+        # /etc/alternatives/servlet was removed on uninstall.
+        # Create a broken symlink to make sure update-alternatives works correctly and falls back
+        # to servletapi5 or servletapi4 if they're installed.
+        ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_sysconfdir}/alternatives/servlet
+    fi
     update-alternatives --remove servlet \
         %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 fi
@@ -788,10 +806,11 @@ fi
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar
 %{_javadir}/%{name}-servlet.jar
+%{_javadir}/servlet.jar
 %ghost %{_sysconfdir}/alternatives/servlet
 
 %files webapps
-%defattr(0644,tomcat,tomcat,0755)
+%defattr(0644,root,tomcat,0755)
 #bnc#520532
 %config(noreplace) %{tomcatappdir}/ROOT
 %{tomcatappdir}/examples