Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2020-08-29 20:33:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Sat Aug 29 20:33:44 2020 rev:71 rq:829682 version:9.0.36 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2020-07-31 15:58:46.356448400 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new.3399/tomcat.changes 2020-08-29 20:34:12.337259586 +0200 @@ -1,0 +2,5 @@ +Wed Aug 26 06:04:58 UTC 2020 - Fridrich Strba <[email protected]> + +- Avoid hardcoding /usr/lib as libexecdir + +------------------------------------------------------------------- Old: ---- tomcat-serverxml-tool.sh New: ---- tomcat-serverxml-tool.sh.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.8Ga5AR/_old 2020-08-29 20:34:14.421260465 +0200 +++ /var/tmp/diff_new_pack.8Ga5AR/_new 2020-08-29 20:34:14.425260467 +0200 @@ -65,7 +65,7 @@ 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 @@ # 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 ++++++ tomcat-serverxml-tool.sh.in ++++++ #!/bin/bash JAR=@LIBEXECDIR@/tomcat/serverxmltool.jar SERVERXML=/etc/tomcat/server.xml function usage { echo "Usage: <script> add|remove docBase path [contextXmlFile]" } if [[ -z "$1" || -z "$2" ]]; then usage exit 1 fi CMD="$1" DOCBASE="$2" CTXPATH="$3" CONTEXTXML=${4:-''} if [ "$CMD" = "add" ]; then XSLT="add-context.xslt" elif [ "$CMD" = "remove" ]; then XSLT="remove-context.xslt" else usage exit 1; fi SUFIX=$(date +%H%M%S%N) rm -f ${SERVERXML}.new${SUFIX} ${SERVERXML}.old${SUFIX} /usr/bin/java -jar $JAR $XSLT $SERVERXML $DOCBASE $CTXPATH $CONTEXTXML > ${SERVERXML}.new${SUFIX} if [ $? -eq 0 ]; then mv $SERVERXML ${SERVERXML}.old${SUFIX} mv ${SERVERXML}.new${SUFIX} $SERVERXML rm ${SERVERXML}.old${SUFIX} if [ "$CMD" = "add" ]; then echo "Added webapp $CTXPATH from $DOCBASE to $SERVERXML." else echo "Removed webapp $CTXPATH from $SERVERXML." fi else echo "$SERVERXML was not modified." rm ${SERVERXML}.new${SUFIX} exit 2 fi
