From 04c4ab4e9f08f54e79f859e6b34d0b89d73e863d69fc600dfa29464957aac9a8 Mon Sep 17 00:00:00 2001
From: Matei Albu <malbu@suse.com>
Date: Mon, 4 Dec 2017 10:14:09 +0000
Subject: [PATCH] Accepting request 548034 from
 home:mateialbu:branches:Java:packages

update-alternatives fixes

OBS-URL: https://build.opensuse.org/request/show/548034
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=116
---
 tomcat.changes |  7 +++++--
 tomcat.spec    | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/tomcat.changes b/tomcat.changes
index 7118335..4601098 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -19,9 +19,12 @@ Fri Dec  1 21:46:18 UTC 2017 - malbu@suse.com
   * Added: tomcat-9.0-sle.catalina.policy.patch
   * Added: tomcat-9.0-tomcat-users-webapp.patch
 - Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
+  to reflect the new Servlet API version.
 - Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
-- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
-  as %ghost
+- Renamed symlink /usr/share/java/servlet.jar to 
+  /usr/share/java/tomcat-servlet.jar to avoid file conflict
+  with servletapi5
+- Fixed wrong %ghost file paths for alternatives symlinks
 
 -------------------------------------------------------------------
 Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com
diff --git a/tomcat.spec b/tomcat.spec
index 41c2a29..5fb5e32 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -567,10 +567,10 @@ ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
 
 # Install update-alternatives content                                              
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives              
-ln -s %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar        
-ln -s %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
-ln -s %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar      
-ln -s %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/servlet.jar
+ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar        
+ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
+ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar      
+ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar
 
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
@@ -628,7 +628,7 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %post servlet-4_0-api
-update-alternatives --install %{_javadir}/servlet.jar servlet \
+update-alternatives --install %{_javadir}/%{name}-servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
 
 %postun servlet-4_0-api
@@ -714,10 +714,10 @@ rm -f \
 %else
 %{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
 %endif
-%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
+%{_javadir}/el_1_0_api.jar
+%{_javadir}/el_api.jar
+%ghost %{_sysconfdir}/alternatives/el_1_0_api
+%ghost %{_sysconfdir}/alternatives/el_api
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
@@ -725,8 +725,8 @@ rm -f \
 %files jsp-2_3-api
 %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 %{_javadir}/%{name}-jsp-api.jar
-%ghost %{_javadir}/jsp.jar
-%ghost %{_sysconfdir}/alternatives/jsp.jar
+%{_javadir}/jsp.jar
+%ghost %{_sysconfdir}/alternatives/jsp
 %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
 %if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
@@ -773,8 +773,8 @@ rm -f \
 %doc LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar
-%ghost %{_javadir}/servlet.jar
-%ghost %{_sysconfdir}/alternatives/servlet.jar
+%{_javadir}/%{name}-servlet.jar
+%ghost %{_sysconfdir}/alternatives/servlet
 %if %{defined _maven_repository}
 %{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
 %else