[tomcat/f21] Updated to 7.0.57

[Ivan Afonichev]

commit cbaafa9fbe72bd339790b2f31f02e36bdab539d3
Author: Ivan Afonichev <iafonichev at griddynamics.com>
Date:   Sat Feb 14 23:14:03 2015 +0300

            Updated to 7.0.57
    
            - Create and own %{_localstatedir}/lib/tomcats, resolves: rhbz#1026741
            - Add pom for tomcat-jdbc, resolves: rhbz#1011003
            - Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
            - Use CATALINA_OPTS only on start, resolves: rhbz#1051194

 sources       |    2 +-
 tomcat-server |    3 ++-
 tomcat.spec   |   21 +++++++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 156bd93..b2de56c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb0c079d6a16466cc70dba07754c9ee6  apache-tomcat-7.0.54-src.tar.gz
+76ffd21bf8960f224c3cee2426fc9ed9  apache-tomcat-7.0.57-src.tar.gz
diff --git a/tomcat-server b/tomcat-server
index bd55999..bc8bb80 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -4,7 +4,7 @@
 
 MAIN_CLASS=org.apache.catalina.startup.Bootstrap
 
-FLAGS="$JAVA_OPTS $CATALINA_OPTS"
+FLAGS="$JAVA_OPTS"
 OPTIONS="-Dcatalina.base=$CATALINA_BASE \
 -Dcatalina.home=$CATALINA_HOME \
 -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
@@ -13,6 +13,7 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \
 -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 
 if [ "$1" = "start" ] ; then
+    FLAGS="${FLAGS} $CATALINA_OPTS"
   if [ "${SECURITY_MANAGER}" = "true" ] ; then
     OPTIONS="${OPTIONS} \
     -Djava.security.manager \
diff --git a/tomcat.spec b/tomcat.spec
index d9de221..58ec5a9 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.2
 %global major_version 7
 %global minor_version 0
-%global micro_version 54
+%global micro_version 57
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 3.0
 %global elspec 2.2
@@ -54,7 +54,7 @@
 Name:          tomcat
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       3%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         System Environment/Daemons
@@ -250,6 +250,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
    touch HACK
    %{__mkdir_p} HACKDIR
    touch HACKDIR/build.xml
+   touch HACKDIR/LICENSE
    # who needs a build.properties file anyway
    %{ant} -Dbase.path="." \
       -Dbuild.compiler="modern" \
@@ -261,6 +262,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
       -Dtomcat-native.tar.gz="HACK" \
       -Dtomcat-native.home="." \
+      -Dtomcat-native.win.path="HACKDIR" \
       -Dcommons-daemon.native.win.mgr.exe="HACK" \
       -Dnsis.exe="HACK" \
       -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
@@ -384,6 +386,13 @@ popd
 %{__install} -m 0644 %{SOURCE32} \
     ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
 
+# Substitute libnames in catalina-tasks.xml
+sed -i \
+   "s,el-api.jar,%{name}-el-%{elspec}-api.jar,;
+    s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,;
+    s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \
+    ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml
+
 # create jsp and servlet API symlinks
 pushd ${RPM_BUILD_ROOT}%{_javadir}
    %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
@@ -497,6 +506,9 @@ done
 %{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
 %add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
 
+%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
+%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
+
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
 cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf <<EOF
 f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
@@ -669,6 +681,11 @@ fi
 %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
 
 %changelog
+* Sun Nov 16 2014 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.57-1
+- Updated to 7.0.57
+- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
+- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
+
 * Mon Jun 16 2014 Michal Srb <msrb at redhat.com> - 0:7.0.54-3
 - jsp-api requires el-api