Accepting request 829682 from Java:packages

libexecdir fixes

OBS-URL: https://build.opensuse.org/request/show/829682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=71

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
+fi

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>
 

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