[RPM (6.0)] tomcat7-7.0.54-1.jpp6
Ralph Apel <[email protected]> Sun, 29 Jun 2014 14:51:43 +0200
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : tomcat7 Relocations: (not relocatable) Version : 7.0.54 Vendor: JPackage Project Release : 1.jpp6 Build Date: Sun 29 Jun 2014 02:41:53 PM CEST Install Date: (not installed) Build Host: localhost.localdomain Group : Networking/Daemons Source RPM: (none) Size : 6764599 License: ASL 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://tomcat.apache.org/ Summary : Apache Servlet/JSP Engine, RI for Servlet 3.0/JSP 2.2 API Description : Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. Tomcat is developed in an open and participatory environment and released under the Apache Software License version 2.0. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. --------------- Ralph Apel <[email protected]> 0:7.0.54-1 - 7.0.54 with native 1.1.30, commons-daemon 1.0.15, commons-logging 1.1.3 - Patched out CompilerOptions.VERSION_1_8 in JDTCompiler, need newer ECJ version - compile-java6, package-java7 only, no tomcat7-websocket, we need JPP-7.0 !! --------------- --------------- Index: tomcat7-JDTCompiler.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-JDTCompiler.patch,v retrieving revision 1.1 diff -u -r1.1 tomcat7-JDTCompiler.patch --- tomcat7-JDTCompiler.patch 26 Jan 2013 08:51:04 -0000 1.1 +++ tomcat7-JDTCompiler.patch 29 Jun 2014 12:51:41 -0000 @@ -1,5 +1,5 @@ ---- java/org/apache/jasper/compiler/JDTCompiler.java.sav 2013-01-01 14:12:02.824653355 +0100 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2013-01-01 14:12:15.236591979 +0100 +--- java/org/apache/jasper/compiler/JDTCompiler.java.sav1 2014-05-19 21:48:01.000000000 +0200 ++++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-06-29 10:19:38.075777894 +0200 @@ -166,7 +166,7 @@ return result; } @@ -9,3 +9,33 @@ public boolean ignoreOptionalProblems() { return false; } +@@ -333,9 +333,9 @@ + } else if(opt.equals("1.7")) { + settings.put(CompilerOptions.OPTION_Source, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_Source, +- CompilerOptions.VERSION_1_8); ++// } else if(opt.equals("1.8")) { ++// settings.put(CompilerOptions.OPTION_Source, ++// CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown source VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_Source, +@@ -377,11 +377,11 @@ + CompilerOptions.VERSION_1_7); + settings.put(CompilerOptions.OPTION_Compliance, + CompilerOptions.VERSION_1_7); +- } else if(opt.equals("1.8")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_1_8); +- settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_1_8); ++// } else if(opt.equals("1.8")) { ++// settings.put(CompilerOptions.OPTION_TargetPlatform, ++// CompilerOptions.VERSION_1_8); ++// settings.put(CompilerOptions.OPTION_Compliance, ++// CompilerOptions.VERSION_1_8); + } else { + log.warn("Unknown target VM " + opt + " ignored."); + settings.put(CompilerOptions.OPTION_TargetPlatform, Index: tomcat7-build.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-build.patch,v retrieving revision 1.2 diff -u -r1.2 tomcat7-build.patch --- tomcat7-build.patch 26 Jan 2013 08:51:04 -0000 1.2 +++ tomcat7-build.patch 29 Jun 2014 12:51:41 -0000 @@ -1,7 +1,17 @@ ---- build.xml.sav0 2012-12-04 09:58:50.000000000 +0100 -+++ build.xml 2013-01-01 14:39:22.703608105 +0100 -@@ -585,7 +585,7 @@ - +--- build.xml.sav0 2014-05-19 21:47:15.000000000 +0200 ++++ build.xml 2014-06-29 11:54:03.360132883 +0200 +@@ -595,7 +595,8 @@ + </copy> + </target> + +- <target name="compile" depends="compile-java6,compile-java7" /> ++ <!--<target name="compile" depends="compile-java6,compile-java7" />--> ++ <target name="compile" depends="compile-java6" /> + + <target name="compile-java6" + depends="build-prepare,download-compile,compile-prepare,validate"> +@@ -660,7 +661,7 @@ + </target> - <target name="build-manifests" unless="manifests.uptodate" @@ -9,7 +19,30 @@ depends="build-prepare"> <!-- Filtering tokens for JAR manifests--> <filter token="source.jdk" value="${compile.source}"/> -@@ -1476,7 +1476,7 @@ +@@ -679,7 +680,8 @@ + + </target> + +- <target name="package" depends="compile,build-manifests,package-java7" > ++ <!--<target name="package" depends="compile,build-manifests,package-java7" >--> ++ <target name="package" depends="compile,build-manifests" > + <!-- Common Annotations 1.0 JAR File --> + <jarIt jarfile="${annotations-api.jar}" + filesDir="${tomcat.classes}" +@@ -1173,10 +1175,12 @@ + <jarIt jarfile="${tomcat-embed-el.jar}" + filesDir="${tomcat.classes}" + filesId="files.tomcat-embed-el"/> ++ <!-- + <jarIt jarfile="${tomcat7-embed-websocket.jar}" + filesDir="${tomcat.classes}" + filesId="files.tomcat7-embed-websocket" + meta-inf="${tomcat.manifests}/tomcat7-websocket.jar"/> ++ --> + <jarIt jarfile="${tomcat-embed-juli.jar}" + filesDir="${tomcat.classes}" + filesId="files.tomcat-juli"/> +@@ -1720,7 +1724,7 @@ </target> @@ -18,7 +51,7 @@ <mkdir dir="${tomcat.dist}"/> <mkdir dir="${tomcat.dist}/bin"/> <mkdir dir="${tomcat.dist}/conf"/> -@@ -1531,24 +1531,22 @@ +@@ -1775,24 +1779,22 @@ <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/> <!-- Windows binaries --> @@ -45,7 +78,7 @@ <!-- platform README files --> <echo append="false" file="${tomcat.dist}/bin/i64/README"> -@@ -1785,7 +1783,7 @@ +@@ -2125,7 +2127,7 @@ </target> <target name="release" @@ -54,7 +87,7 @@ description="Create a Tomcat 7 packaged distribution"> <copy file="KEYS" -@@ -1905,67 +1903,6 @@ +@@ -2248,67 +2250,6 @@ <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" /> </antcall> @@ -122,7 +155,7 @@ </target> <!-- Packages the deployer distribution in zip format --> -@@ -2252,7 +2189,9 @@ +@@ -2613,7 +2554,9 @@ <target name="clean-depend" description="Deletes the dependencies that are built from source"> @@ -132,7 +165,7 @@ </target> <target name="clean" -@@ -2372,7 +2311,6 @@ +@@ -2750,7 +2693,6 @@ <param name="destfile" value="${nsis.exe}"/> <param name="destdir" value="${nsis.home}/.."/> </antcall> Index: tomcat7.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7.spec,v retrieving revision 1.7 diff -u -r1.7 tomcat7.spec --- tomcat7.spec 14 Apr 2013 11:56:12 -0000 1.7 +++ tomcat7.spec 29 Jun 2014 12:51:41 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2013, JPackage Project +# Copyright (c) 2000-2014, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -37,12 +37,18 @@ %define jspspec 2.2 %define major_version 7 %define minor_version 0 -%define micro_version 39 +%define micro_version 54 %define packdname apache-tomcat-%{major_version}.%{minor_version}.%{micro_version}-src %define servletspec 3.0 %define elspec 2.2 %define tcuid 91 +%define native_version 1.1.30 +%define commons_pool_version 1.5.7 +%define commons_dbcp_version 1.4 +%define commons_daemon_version 1.0.15 +%define commons_logging_version 1.1.3 + # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %define basedir %{_var}/lib/%{name} %define appdir %{basedir}/webapps @@ -59,7 +65,7 @@ Name: tomcat7 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: Networking/Daemons @@ -74,33 +80,33 @@ Source6: %{name}-%{major_version}.%{minor_version}-digest.script Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script Source8: %{name}-%{major_version}.%{minor_version}.starter -Source11: http://archive.apache.org/dist/commons/pool/source/commons-pool-1.5.7-src.tar.gz -Source12: http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz -Source13: http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz -Source14: http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz -Source15: http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz -Source21: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/7.0.39/tomcat-annotations-api-7.0.39.pom -Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/7.0.39/tomcat-api-7.0.39.pom -Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/7.0.39/tomcat-catalina-7.0.39.pom -Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/7.0.39/tomcat-catalina-ant-7.0.39.pom -Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/7.0.39/tomcat-catalina-ha-7.0.39.pom -Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/7.0.39/tomcat-catalina-jmx-remote-7.0.39.pom -Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/7.0.39/tomcat-catalina-ws-7.0.39.pom -Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/7.0.39/tomcat-coyote-7.0.39.pom -Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/7.0.39/tomcat-dbcp-7.0.39.pom -Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/7.0.39/tomcat-el-api-7.0.39.pom -Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/7.0.39/tomcat-i18n-es-7.0.39.pom -Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/7.0.39/tomcat-i18n-fr-7.0.39.pom -Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/7.0.39/tomcat-i18n-ja-7.0.39.pom - -Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/7.0.39/tomcat-jasper-7.0.39.pom -Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/7.0.39/tomcat-jasper-el-7.0.39.pom -Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/7.0.39/tomcat-jdbc-7.0.39.pom -Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/7.0.39/tomcat-jsp-api-7.0.39.pom -Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/7.0.39/tomcat-juli-7.0.39.pom -Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/7.0.39/tomcat-servlet-api-7.0.39.pom -Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/7.0.39/tomcat-tribes-7.0.39.pom -Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/7.0.39/tomcat-util-7.0.39.pom +Source11: http://archive.apache.org/dist/commons/pool/source/commons-pool-%{commons_pool_version}-src.tar.gz +Source12: http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{commons_dbcp_version}-src.tar.gz +Source13: http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{native_version}/source/tomcat-native-%{native_version}-src.tar.gz +Source14: http://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{commons_daemon_version}-native-src.tar.gz +Source15: http://www.apache.org/dist/commons/logging/source/commons-logging-%{commons_logging_version}-src.tar.gz +Source21: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/%{version}/tomcat-annotations-api-%{version}.pom +Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/%{version}/tomcat-api-%{version}.pom +Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/%{version}/tomcat-catalina-%{version}.pom +Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/%{version}/tomcat-catalina-ant-%{version}.pom +Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/%{version}/tomcat-catalina-ha-%{version}.pom +Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/%{version}/tomcat-catalina-jmx-remote-%{version}.pom +Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/%{version}/tomcat-catalina-ws-%{version}.pom +Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/%{version}/tomcat-coyote-%{version}.pom +Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/%{version}/tomcat-dbcp-%{version}.pom +Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/%{version}/tomcat-el-api-%{version}.pom +Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/%{version}/tomcat-i18n-es-%{version}.pom +Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/%{version}/tomcat-i18n-fr-%{version}.pom +Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/%{version}/tomcat-i18n-ja-%{version}.pom + +Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/%{version}/tomcat-jasper-%{version}.pom +Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/%{version}/tomcat-jasper-el-%{version}.pom +Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/%{version}/tomcat-jdbc-%{version}.pom +Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/%{version}/tomcat-jsp-api-%{version}.pom +Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/%{version}/tomcat-juli-%{version}.pom +Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/%{version}/tomcat-servlet-api-%{version}.pom +Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/%{version}/tomcat-tribes-%{version}.pom +Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/%{version}/tomcat-util-%{version}.pom Patch0: %{name}-build.patch Patch1: %{name}-JDTCompiler.patch @@ -259,16 +265,17 @@ export OPT_JAR_LIST="ant/ant-trax" pushd %{packdname} mkdir -p commons/pool/source/ - ln -s %{SOURCE11} commons/pool/source/commons-pool-1.5.7-src.tar.gz + ln -s %{SOURCE11} commons/pool/source/commons-pool-%{commons_pool_version}-src.tar.gz mkdir -p commons/dbcp/source/ - ln -s %{SOURCE12} commons/dbcp/source/commons-dbcp-1.4-src.tar.gz - mkdir -p tomcat/tomcat-connectors/native/1.1.27/source/ - ln -s %{SOURCE13} tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz + ln -s %{SOURCE12} commons/dbcp/source/commons-dbcp-%{commons_dbcp_version}-src.tar.gz + mkdir -p tomcat/tomcat-connectors/native/%{native_version}/source/ + ln -s %{SOURCE13} tomcat/tomcat-connectors/native/%{native_version}/source/tomcat-native-%{native_version}-src.tar.gz mkdir -p commons/daemon/source/ - ln -s %{SOURCE14} commons/daemon/source/commons-daemon-1.0.14-native-src.tar.gz + ln -s %{SOURCE14} commons/daemon/source/commons-daemon-%{commons_daemon_version}-native-src.tar.gz mkdir -p commons/logging/source/ - ln -s %{SOURCE15} commons/logging/source/commons-logging-1.1.1-src.tar.gz + ln -s %{SOURCE15} commons/logging/source/commons-logging-%{commons_logging_version}-src.tar.gz %{ant} -Dbase.path="." \ + -Djava.7.home=%{_jvmdir}/java \ -Dbase-apache.loc.1=file://$(pwd) \ -Dbase-apache.loc.2=file://$(pwd) \ -Dcommons-daemon.jar=$(build-classpath commons-daemon) \ @@ -282,43 +289,6 @@ -Dskip.installer=true \ deploy javadoc extras embed release -# -Dbuild.compiler="modern" \ -# -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -# -Dcommons-daemon.native.src.tgz=%{SOURCE11} \ -# -Djasper-jdt.jar="$(build-classpath ecj3)" \ -# -Dtomcat-dbcp.jar="HACK" \ -# -Dversion="%{version}" \ -# -Dversion.build="%{micro_version}" - -# -Dtomcat-native.tar.gz="HACK" \ -# -Dcommons-daemon.native.src.tgz="HACK" \ - -# %{ant} -f extras.xml \ -# -Dcommons-logging.home=$(pwd) \ -# -Dcommons-logging-src.loc=file://%{SOURCE13} \ -# -Davalon-framework.home=$(pwd) \ -# -Davalon-framework.loc=file://$(build-classpath avalon-framework) \ -# -Dlog4j.home=$(pwd) \ -# -Dlog4j.loc=file://$(build-classpath log4j) \ -# -Dlogkit.home=$(pwd) \ -# -Dlogkit.loc=file://$(build-classpath avalon-logkit) \ -# -Dservletapi.home=$(pwd) \ -# -Dservletapi.loc=file://$(build-classpath geronimo-servlet-2.5-api) \ -# -Djaxrpc-lib.home=$(pwd) \ -# -Djaxrpc-lib.loc=file://$(build-classpath geronimo-jaxrpc-1.1-api) \ -# -Dwsdl4j-lib.home=$(pwd) \ -# -Dwsdl4j-lib.loc=file://$(build-classpath wsdl4j) -# # javadoc generation -# %{ant} -f dist.xml dist-prepare -# %{ant} -f dist.xml dist-source -# %{ant} -f dist.xml dist-javadoc - # remove some jars that we'll replace with symlinks later -# %{__rm} output/build/bin/commons-daemon.jar \ -# output/build/lib/ecj3.jar -# # remove the cruft we created -# %{__rm} output/build/bin/tomcat-native.tar.gz -# find -name HACK -exec %{__rm} {} \; - popd pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes @@ -456,67 +426,67 @@ # install poms and depmap frags %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms -#Source21: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/7.0.39/tomcat-annotations-api-7.0.39.pom +#Source21: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/%{version}/tomcat-annotations-api-%{version}.pom %{__install} -m 0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-annotations-api.pom %add_to_maven_depmap org.apache.tomcat tomcat-annotations-api %{version} JPP/%{name} annotations-api -#Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/7.0.39/tomcat-api-7.0.39.pom +#Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/%{version}/tomcat-api-%{version}.pom %{__install} -m 0644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-api.pom %add_to_maven_depmap org.apache.tomcat tomcat-api %{version} JPP/%{name} tomcat-api -#Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/7.0.39/tomcat-catalina-7.0.39.pom +#Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/%{version}/tomcat-catalina-%{version}.pom %{__install} -m 0644 %{SOURCE23} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-catalina.pom %add_to_maven_depmap org.apache.tomcat tomcat-catalina %{version} JPP/%{name} catalina -#Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/7.0.39/tomcat-catalina-ant-7.0.39.pom +#Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/%{version}/tomcat-catalina-ant-%{version}.pom %{__install} -m 0644 %{SOURCE24} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-catalina-ant.pom %add_to_maven_depmap org.apache.tomcat tomcat-catalina-ant %{version} JPP/%{name} catalina-ant -#Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/7.0.39/tomcat-catalina-ha-7.0.39.pom +#Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/%{version}/tomcat-catalina-ha-%{version}.pom %{__install} -m 0644 %{SOURCE25} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-catalina-ha.pom %add_to_maven_depmap org.apache.tomcat tomcat-catalina-ha %{version} JPP/%{name} catalina-ha -#Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/7.0.39/tomcat-catalina-jmx-remote-7.0.39.pom +#Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/%{version}/tomcat-catalina-jmx-remote-%{version}.pom %{__install} -m 0644 %{SOURCE26} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-catalina-jmx-remote.pom %add_to_maven_depmap org.apache.tomcat tomcat-catalina-jmx-remote %{version} JPP/%{name} catalina-jmx-remote -#Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/7.0.39/tomcat-catalina-ws-7.0.39.pom +#Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/%{version}/tomcat-catalina-ws-%{version}.pom %{__install} -m 0644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-catalina-ws.pom %add_to_maven_depmap org.apache.tomcat tomcat-catalina-ws %{version} JPP/%{name} catalina-ws -#Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/7.0.39/tomcat-coyote-7.0.39.pom +#Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/%{version}/tomcat-coyote-%{version}.pom %{__install} -m 0644 %{SOURCE28} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-coyote.pom %add_to_maven_depmap org.apache.tomcat tomcat-coyote %{version} JPP/%{name} tomcat-coyote -#Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/7.0.39/tomcat-dbcp-7.0.39.pom +#Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/%{version}/tomcat-dbcp-%{version}.pom %{__install} -m 0644 %{SOURCE29} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-dbcp.pom %add_to_maven_depmap org.apache.tomcat tomcat-dbcp %{version} JPP/%{name} tomcat-dbcp -#Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/7.0.39/tomcat-el-api-7.0.39.pom +#Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/%{version}/tomcat-el-api-%{version}.pom %{__install} -m 0644 %{SOURCE30} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat7-el-2.2-api.pom %add_to_maven_depmap org.apache.tomcat tomcat-el-api %{version} JPP tomcat7-el-2.2-api -#Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/7.0.39/tomcat-i18n-es-7.0.39.pom +#Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/%{version}/tomcat-i18n-es-%{version}.pom %{__install} -m 0644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-i18n-es.pom %add_to_maven_depmap org.apache.tomcat tomcat-i18n-es %{version} JPP/%{name} tomcat-i18n-es -#Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/7.0.39/tomcat-i18n-fr-7.0.39.pom +#Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/%{version}/tomcat-i18n-fr-%{version}.pom %{__install} -m 0644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-i18n-fr.pom %add_to_maven_depmap org.apache.tomcat tomcat-i18n-fr %{version} JPP/%{name} tomcat-i18n-fr -#Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/7.0.39/tomcat-i18n-ja-7.0.39.pom +#Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/%{version}/tomcat-i18n-ja-%{version}.pom %{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-i18n-ja.pom %add_to_maven_depmap org.apache.tomcat tomcat-i18n-ja %{version} JPP/%{name} tomcat-i18n-ja -#Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/7.0.39/tomcat-jasper-7.0.39.pom +#Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/%{version}/tomcat-jasper-%{version}.pom %{__install} -m 0644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-jasper.pom %add_to_maven_depmap org.apache.tomcat tomcat-jasper %{version} JPP/%{name} tomcat-jasper -#Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/7.0.39/tomcat-jasper-el-7.0.39.pom +#Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/%{version}/tomcat-jasper-el-%{version}.pom %{__install} -m 0644 %{SOURCE36} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-jasper-el.pom %add_to_maven_depmap org.apache.tomcat tomcat-jasper-el %{version} JPP/%{name} tomcat-jasper-el -#Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/7.0.39/tomcat-jdbc-7.0.39.pom +#Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/%{version}/tomcat-jdbc-%{version}.pom %{__install} -m 0644 %{SOURCE37} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-jdbc.pom %add_to_maven_depmap org.apache.tomcat tomcat-jdbc %{version} JPP/%{name} tomcat-jdbc -#Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/7.0.39/tomcat-jsp-api-7.0.39.pom +#Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/%{version}/tomcat-jsp-api-%{version}.pom %{__install} -m 0644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat7-jsp-2.2-api.pom %add_to_maven_depmap org.apache.tomcat tomcat-jsp-api %{version} JPP tomcat7-jsp-2.2-api -#Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/7.0.39/tomcat-juli-7.0.39.pom +#Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/%{version}/tomcat-juli-%{version}.pom %{__install} -m 0644 %{SOURCE39} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-juli.pom %add_to_maven_depmap org.apache.tomcat tomcat-juli %{version} JPP/%{name} tomcat-juli -#Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/7.0.39/tomcat-servlet-api-7.0.39.pom +#Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/%{version}/tomcat-servlet-api-%{version}.pom %{__install} -m 0644 %{SOURCE40} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat7-servlet-3.0-api.pom %add_to_maven_depmap org.apache.tomcat tomcat-servlet-api %{version} JPP tomcat7-servlet-3.0-api -#Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/7.0.39/tomcat-tribes-7.0.39.pom +#Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/%{version}/tomcat-tribes-%{version}.pom %{__install} -m 0644 %{SOURCE41} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-tribes.pom %add_to_maven_depmap org.apache.tomcat tomcat-tribes %{version} JPP/%{name} tomcat-tribes -#Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/7.0.39/tomcat-util-7.0.39.pom +#Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/%{version}/tomcat-util-%{version}.pom %{__install} -m 0644 %{SOURCE42} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-util.pom %add_to_maven_depmap org.apache.tomcat tomcat-util %{version} JPP/%{name} tomcat-util @@ -702,11 +672,13 @@ %{appdir}/sample %changelog -* Sun Apr 14 2013 Ralph Apel <[email protected]> 0:7.0.39-3 -- Fix typo in init - -* Sun Apr 14 2013 Ralph Apel <[email protected]> 0:7.0.39-2 -- Fix bug analogous to 356 for tomcat6 +* Sun Jun 29 2014 Ralph Apel <[email protected]> 0:7.0.54-1 +- 7.0.54 with native 1.1.30, commons-daemon 1.0.15, + commons-logging 1.1.3 +- Patched out CompilerOptions.VERSION_1_8 in JDTCompiler, + need newer ECJ version +- compile-java6, package-java7 only, no tomcat7-websocket, + we need JPP-7.0 !! * Sat Apr 13 2013 Ralph Apel <[email protected]> 0:7.0.39-1 - 7.0.39