[RPM (6.0)] [DIST generic] tomcat7-7.0.34-1.jpp6
Ralph Apel <[email protected]> Sat, 26 Jan 2013 09:51:05 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : tomcat7 Relocations: (not relocatable) Version : 7.0.34 Vendor: JPackage Project Release : 1.jpp6 Build Date: Fri 25 Jan 2013 09:27:33 PM CET Install Date: (not installed) Build Host: linux.fritz.box Group : Networking/Daemons Source RPM: (none) Size : 6243163 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.34-1 - 7.0.34 - fix depmaps --------------- tomcat7.src:187: W: unversioned-explicit-provides jsp22 tomcat7.src:215: W: unversioned-explicit-provides servlet7 tomcat7.src:216: W: unversioned-explicit-provides servlet30 tomcat7.src: W: strange-permission tomcat7-7.0.starter 0775 tomcat7.src: W: strange-permission commons-dbcp-1.4-src.tar.gz 0675 tomcat7.src: W: strange-permission commons-logging-1.1.1-src.tar.gz 0675 tomcat7.src: W: source-or-patch-not-bzipped tomcat7-build.patch tomcat7.src: W: source-or-patch-not-bzipped tomcat7-JDTCompiler.patch tomcat7.src: W: non-standard-group Networking/Daemons tomcat7.src: W: no-signature tomcat7.src: W: mixed-use-of-spaces-and-tabs (spaces: line 136, tab: line 279) tomcat7.src: W: lib-package-without-%mklibname tomcat7.src: W: invalid-license ASL 2.0 tomcat7.src:134: W: hardcoded-library-path in /lib/lsb/init-functions tomcat7.src:135: W: hardcoded-library-path in /lib/lsb/init-functions 1 packages and 0 specfiles checked; 0 errors, 15 warnings. --------------- Index: tomcat7-build.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-build.patch,v retrieving revision 1.1 diff -u -r1.1 tomcat7-build.patch --- tomcat7-build.patch 7 Jan 2012 23:48:20 -0000 1.1 +++ tomcat7-build.patch 26 Jan 2013 08:51:03 -0000 @@ -1,6 +1,6 @@ ---- build.xml.sav0 2011-09-27 22:44:58.000000000 +0200 -+++ build.xml 2011-11-15 14:23:05.000000000 +0100 -@@ -511,7 +511,7 @@ +--- 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 @@ @@ -9,7 +9,16 @@ depends="build-prepare"> <!-- Filtering tokens for JAR manifests--> <filter token="source.jdk" value="${compile.source}"/> -@@ -1455,34 +1455,28 @@ +@@ -1476,7 +1476,7 @@ + + </target> + +- <target name="dist-prepare" depends="download-dist"> ++ <target name="dist-prepare" > + <mkdir dir="${tomcat.dist}"/> + <mkdir dir="${tomcat.dist}/bin"/> + <mkdir dir="${tomcat.dist}/conf"/> +@@ -1531,24 +1531,22 @@ <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/> <!-- Windows binaries --> @@ -26,27 +35,26 @@ <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe" tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> - <!-- tc native --> - <copy file="${tomcat-native.home}/tcnative-1.dll.x86" - tofile="${tomcat.dist}/bin/tcnative-1.dll" /> -- <!-- tc native 64 bit for amd/emt --> - <copy file="${tomcat-native.home}/tcnative-1.dll.x64" - tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" /> -- <!-- tc native 64 bit for ia --> - <copy file="${tomcat-native.home}/tcnative-1.dll.i64" - tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" /> -- <!-- platform README files --> - <echo append="false" file="${tomcat.dist}/bin/i64/README"> - Apache Tomcat ${version} native binaries for Win64 IA64 platform. - </echo> - <echo append="false" file="${tomcat.dist}/bin/x64/README"> - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </echo> -- + <copy todir="${tomcat.dist}/bin"> + <fileset dir="${tomcat-native.home}/bin"> + <include name="*.dll"/> + <include name="**/*.dll"/> + </fileset> + </copy> + --> + + <!-- platform README files --> + <echo append="false" file="${tomcat.dist}/bin/i64/README"> +@@ -1785,7 +1783,7 @@ </target> - <target name="javadoc" depends="dist-source,extras-webservices-prepare" -@@ -1792,67 +1786,6 @@ + <target name="release" +- depends="clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar" ++ depends="clean,clean-depend,release-init,dist-deployer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar" + description="Create a Tomcat 7 packaged distribution"> + + <copy file="KEYS" +@@ -1905,67 +1903,6 @@ <param name="file" value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" /> </antcall> @@ -114,7 +122,7 @@ </target> <!-- Packages the deployer distribution in zip format --> -@@ -2137,7 +2070,9 @@ +@@ -2252,7 +2189,9 @@ <target name="clean-depend" description="Deletes the dependencies that are built from source"> @@ -124,21 +132,11 @@ </target> <target name="clean" -@@ -2232,7 +2167,7 @@ - - <target name="download-dist" - description="Download additional components for a distribution" > -- -+<!-- - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/> - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/> -@@ -2266,7 +2201,7 @@ +@@ -2372,7 +2311,6 @@ <param name="destfile" value="${nsis.exe}"/> <param name="destdir" value="${nsis.home}/.."/> </antcall> - -+--> </target> Index: tomcat7.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7.spec,v retrieving revision 1.1 diff -u -r1.1 tomcat7.spec --- tomcat7.spec 7 Jan 2012 23:48:20 -0000 1.1 +++ tomcat7.spec 26 Jan 2013 08:51:03 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2012, JPackage Project +# Copyright (c) 2000-2013, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ %define jspspec 2.2 %define major_version 7 %define minor_version 0 -%define micro_version 22 +%define micro_version 34 %define packdname apache-tomcat-%{major_version}.%{minor_version}.%{micro_version}-src %define servletspec 3.0 %define elspec 2.2 @@ -55,7 +55,7 @@ Name: tomcat7 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -70,35 +70,36 @@ 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://www.apache.org/dist/commons/pool/source/commons-pool-1.5.6-src.tar.gz +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.22/source/tomcat-native-1.1.22-src.tar.gz -Source14: http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.7-native-src.tar.gz +Source13: http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz +Source14: http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.10-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.22/tomcat-annotations-api-7.0.22.pom -Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/7.0.22/tomcat-api-7.0.22.pom -Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/7.0.22/tomcat-catalina-7.0.22.pom -Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/7.0.22/tomcat-catalina-ant-7.0.22.pom -Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/7.0.22/tomcat-catalina-ha-7.0.22.pom -Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/7.0.22/tomcat-catalina-jmx-remote-7.0.22.pom -Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/7.0.22/tomcat-catalina-ws-7.0.22.pom -Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/7.0.22/tomcat-coyote-7.0.22.pom -Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/7.0.22/tomcat-dbcp-7.0.22.pom -Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/7.0.22/tomcat-el-api-7.0.22.pom -Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/7.0.22/tomcat-i18n-es-7.0.22.pom -Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/7.0.22/tomcat-i18n-fr-7.0.22.pom -Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/7.0.22/tomcat-i18n-ja-7.0.22.pom - -Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/7.0.22/tomcat-jasper-7.0.22.pom -Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/7.0.22/tomcat-jasper-el-7.0.22.pom -Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/7.0.22/tomcat-jdbc-7.0.22.pom -Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/7.0.22/tomcat-jsp-api-7.0.22.pom -Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/7.0.22/tomcat-juli-7.0.22.pom -Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/7.0.22/tomcat-servlet-api-7.0.22.pom -Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/7.0.22/tomcat-tribes-7.0.22.pom -Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/7.0.22/tomcat-util-7.0.22.pom +Source21: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/7.0.34/tomcat-annotations-api-7.0.34.pom +Source22: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-api/7.0.34/tomcat-api-7.0.34.pom +Source23: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/7.0.34/tomcat-catalina-7.0.34.pom +Source24: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ant/7.0.34/tomcat-catalina-ant-7.0.34.pom +Source25: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ha/7.0.34/tomcat-catalina-ha-7.0.34.pom +Source26: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-jmx-remote/7.0.34/tomcat-catalina-jmx-remote-7.0.34.pom +Source27: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina-ws/7.0.34/tomcat-catalina-ws-7.0.34.pom +Source28: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-coyote/7.0.34/tomcat-coyote-7.0.34.pom +Source29: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-dbcp/7.0.34/tomcat-dbcp-7.0.34.pom +Source30: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-el-api/7.0.34/tomcat-el-api-7.0.34.pom +Source31: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-es/7.0.34/tomcat-i18n-es-7.0.34.pom +Source32: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-fr/7.0.34/tomcat-i18n-fr-7.0.34.pom +Source33: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-i18n-ja/7.0.34/tomcat-i18n-ja-7.0.34.pom + +Source35: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper/7.0.34/tomcat-jasper-7.0.34.pom +Source36: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/7.0.34/tomcat-jasper-el-7.0.34.pom +Source37: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jdbc/7.0.34/tomcat-jdbc-7.0.34.pom +Source38: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/7.0.34/tomcat-jsp-api-7.0.34.pom +Source39: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-juli/7.0.34/tomcat-juli-7.0.34.pom +Source40: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/7.0.34/tomcat-servlet-api-7.0.34.pom +Source41: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-tribes/7.0.34/tomcat-tribes-7.0.34.pom +Source42: http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-util/7.0.34/tomcat-util-7.0.34.pom Patch0: %{name}-build.patch +Patch1: %{name}-JDTCompiler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -245,6 +246,7 @@ -name "Thumbs.db" \) | xargs -t %{__rm} pushd %{packdname} %patch0 -p0 -b .sav0 +%patch1 -p0 -b .sav1 popd @@ -253,13 +255,13 @@ export OPT_JAR_LIST="ant/ant-trax" pushd %{packdname} mkdir -p commons/pool/source/ - ln -s %{SOURCE11} commons/pool/source/commons-pool-1.5.6-src.tar.gz + ln -s %{SOURCE11} commons/pool/source/commons-pool-1.5.7-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.22/source/ - ln -s %{SOURCE13} tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz + mkdir -p tomcat/tomcat-connectors/native/1.1.24/source/ + ln -s %{SOURCE13} tomcat/tomcat-connectors/native/1.1.24/source/tomcat-native-1.1.24-src.tar.gz mkdir -p commons/daemon/source/ - ln -s %{SOURCE14} commons/daemon/source/commons-daemon-1.0.7-native-src.tar.gz + ln -s %{SOURCE14} commons/daemon/source/commons-daemon-1.0.10-native-src.tar.gz mkdir -p commons/logging/source/ ln -s %{SOURCE15} commons/logging/source/commons-logging-1.1.1-src.tar.gz %{ant} -Dbase.path="." \ @@ -454,7 +456,7 @@ %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.22/tomcat-api-7.0.22.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} api +%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.22/tomcat-catalina-7.0.22.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 @@ -472,46 +474,46 @@ %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.22/tomcat-coyote-7.0.22.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} coyote +%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.22/tomcat-dbcp-7.0.22.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} dbcp +%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.22/tomcat-el-api-7.0.22.pom -%{__install} -m 0644 %{SOURCE30} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-el-api.pom -%add_to_maven_depmap org.apache.tomcat tomcat-el-api %{version} JPP/%{name} el-api +%{__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.22/tomcat-i18n-es-7.0.22.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} i18n-es +%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.22/tomcat-i18n-fr-7.0.22.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} i18n-fr +%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.22/tomcat-i18n-ja-7.0.22.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} i18n-ja +%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.22/tomcat-jasper-7.0.22.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} jasper +%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.22/tomcat-jasper-el-7.0.22.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} jasper-el +%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.22/tomcat-jdbc-7.0.22.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} jdbc +%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.22/tomcat-jsp-api-7.0.22.pom -%{__install} -m 0644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-jsp-api.pom -%add_to_maven_depmap org.apache.tomcat tomcat-jsp-api %{version} JPP/%{name} jsp-api +%{__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.22/tomcat-juli-7.0.22.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} juli +%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.22/tomcat-servlet-api-7.0.22.pom -%{__install} -m 0644 %{SOURCE40} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat7-servlet-api.pom -%add_to_maven_depmap org.apache.tomcat tomcat-servlet-api %{version} JPP/%{name} servlet-api +%{__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.22/tomcat-tribes-7.0.22.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} tribes +%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.22/tomcat-util-7.0.22.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} util +%add_to_maven_depmap org.apache.tomcat tomcat-util %{version} JPP/%{name} tomcat-util %clean @@ -688,6 +690,10 @@ %{appdir}/sample %changelog +* Fri Jan 25 2013 Ralph Apel <[email protected]> 0:7.0.34-1 +- 7.0.34 +- fix depmaps + * Sun Jan 08 2012 Ralph Apel <[email protected]> 0:7.0.22-2 - solve init script and other minor issues (thx Robby Morgan)