From 14216e6c34b8a29968ba612688deca00a2d90739a7e96d477256dc604c2c36cd Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 26 Aug 2020 06:05:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=207

---
 tomcat-serverxml-tool.sh => tomcat-serverxml-tool.sh.in | 4 ++--
 tomcat.changes                                          | 5 +++++
 tomcat.spec                                             | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename tomcat-serverxml-tool.sh => tomcat-serverxml-tool.sh.in (95%)

diff --git a/tomcat-serverxml-tool.sh b/tomcat-serverxml-tool.sh.in
similarity index 95%
rename from tomcat-serverxml-tool.sh
rename to tomcat-serverxml-tool.sh.in
index 5146524..962860f 100644
--- a/tomcat-serverxml-tool.sh
+++ b/tomcat-serverxml-tool.sh.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-JAR=/usr/lib/tomcat/serverxmltool.jar
+JAR=@LIBEXECDIR@/tomcat/serverxmltool.jar
 SERVERXML=/etc/tomcat/server.xml
 
 function usage {
@@ -44,4 +44,4 @@ else
     echo "$SERVERXML was not modified."
     rm ${SERVERXML}.new${SUFIX}
     exit 2
-fi
\ No newline at end of file
+fi
diff --git a/tomcat.changes b/tomcat.changes
index e088cca..bc2d3f6 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 26 06:04:58 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Avoid hardcoding /usr/lib as libexecdir
+
 -------------------------------------------------------------------
 Wed Jul 29 20:48:14 UTC 2020 - Matei Albu <malbu@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 7aff8ef..50ab6b5 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -65,7 +65,7 @@ Source30:       tomcat-preamble
 Source31:       tomcat-server
 Source32:       tomcat-named.service
 Source33:       tomcat-serverxml-tool.tar.gz
-Source34:       tomcat-serverxml-tool.sh
+Source34:       tomcat-serverxml-tool.sh.in
 Source1000:     tomcat-rpmlintrc
 Source1001:     https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
 Source1002:     %{name}.keyring
@@ -579,7 +579,8 @@ EOF
 
 # Install tool used to edit server.xml
 pushd %{_builddir}/tomcat-serverxml-tool
-install -m 0755 %{SOURCE34} \
+cat %{SOURCE34} | sed 's#@LIBEXECDIR@#%{_libexecdir}#g' >tomcat-serverxml-tool.sh
+install -m 0755 tomcat-serverxml-tool.sh \
     %{buildroot}%{_libexecdir}/%{name}/serverxml-tool.sh
 cp serverxmltool.jar %{buildroot}%{_libexecdir}/%{name}/
 popd