From 93f643e335a2cf28b8ac471dc7e9f777fd3e57e7 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Aug 05 2016 14:02:54 +0000 Subject: Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable --- diff --git a/tomcat-7.0.init b/tomcat-7.0.init index f1b6d2d..a3fd004 100644 --- a/tomcat-7.0.init +++ b/tomcat-7.0.init @@ -58,7 +58,7 @@ fi CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat" +TOMCAT_SCRIPT="${TOMCAT_SCRIPT:-/usr/sbin/tomcat}" # Tomcat program name TOMCAT_PROG="${NAME}" diff --git a/tomcat.spec b/tomcat.spec index 3956c3c..62ef199 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -640,7 +640,8 @@ fi - Resolves: rhbz#1352120 The javadoc package is useless; it contains one index.html - Resolves: rhbz#1347838 The security manager doesn't work correctly (JSPs cannot be compiled) - Resolves: rhbz#1327327 rpm -V tomcat fails on /var/log/tomcat/catalina.out -- Resolved: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped +- Resolves: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped +- Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable * Fri Nov 13 2015 Coty Sutherland 0:7.0.65-1 - Updated to 7.0.65