[RPM (5.0-updates)] [DIST generic] tomcat6-6.0.36-1.jpp5
Jason Corley <[email protected]> Fri, 2 Nov 2012 13:40:21 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : tomcat6 Relocations: (not relocatable) Version : 6.0.36 Vendor: JPackage Project Release : 1.jpp5 Build Date: Fri 02 Nov 2012 01:31:46 PM CET Install Date: (not installed) Build Host: flat.netmindz.net Group : Networking/Daemons Source RPM: (none) Size : 3453162 License: ASL 2.0 Signature : (none) Packager : Jason Corley <[email protected]> URL : http://tomcat.apache.org/ Summary : Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 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. --------------- Jason Corley <[email protected]> 0:6.0.36-1jpp - update copyright date - 6.0.36 --------------- tomcat6.src:149: W: unversioned-explicit-provides jsp21 tomcat6.src:177: W: unversioned-explicit-provides servlet6 tomcat6.src:178: W: unversioned-explicit-provides servlet25 tomcat6.src: W: source-or-patch-not-bzipped tomcat6-6.0-bootstrap-MANIFEST.MF.patch tomcat6.src: W: source-or-patch-not-bzipped tomcat6-6.0-tomcat-users-webapp.patch tomcat6.src: W: non-standard-group Networking/Daemons tomcat6.src: W: no-signature tomcat6.src: W: lib-package-without-%mklibname tomcat6.src: W: invalid-license ASL 2.0 tomcat6.src:98: W: hardcoded-library-path in /lib/lsb/init-functions tomcat6.src:99: W: hardcoded-library-path in /lib/lsb/init-functions 1 packages and 0 specfiles checked; 0 errors, 11 warnings. --------------- Index: tomcat6-6.0.init =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6-6.0.init,v retrieving revision 1.11 diff -u -r1.11 tomcat6-6.0.init --- tomcat6-6.0.init 7 Jan 2012 21:57:05 -0000 1.11 +++ tomcat6-6.0.init 2 Nov 2012 12:40:19 -0000 @@ -58,7 +58,7 @@ CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/dtomcat6" +TOMCAT_SCRIPT="/usr/sbin/tomcat6" # Tomcat program name TOMCAT_PROG="${NAME}" Index: tomcat6.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6.spec,v retrieving revision 1.19 diff -u -r1.19 tomcat6.spec --- tomcat6.spec 7 Jan 2012 21:57:05 -0000 1.19 +++ tomcat6.spec 2 Nov 2012 12:40:19 -0000 @@ -33,7 +33,7 @@ %define jspspec 2.1 %define major_version 6 %define minor_version 0 -%define micro_version 33 +%define micro_version 36 %define packdname apache-tomcat-%{major_version}.%{minor_version}.%{micro_version}-src %define servletspec 2.5 %define elspec 1.0 @@ -55,7 +55,7 @@ Name: tomcat6 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 @@ -69,62 +69,34 @@ Source5: %{name}-%{major_version}.%{minor_version}.logrotate 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/daemon/source/commons-daemon-1.0.5-native-src.tar.gz -#Source12: http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.20/source/tomcat-native-1.1.20-src.tar.gz -Source13: commons-logging-1.1.1-src.tar.gz -Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33.pom -Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33.pom -Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.33/catalina-ha-6.0.33.pom -Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.33/coyote-6.0.33.pom -Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.33/dbcp-6.0.33.pom -Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33.pom -#Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.33/juli-6.0.33.pom move it to -Source27: juli-extras-6.0.33.pom -Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.33/juli-adapters-6.0.33.pom -Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33.pom -Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33.pom -Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33.pom -Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.33/juli-6.0.33.pom -Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33.pom -Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.33/tribes-6.0.33.pom - Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: ant >= 0:1.7.1 +BuildRequires: ant BuildRequires: ant-trax -BuildRequires: ecj3 +BuildRequires: ecj BuildRequires: findutils -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-collections-tomcat5 -BuildRequires: apache-commons-daemon -BuildRequires: apache-commons-dbcp-tomcat5 -BuildRequires: apache-commons-pool-tomcat5 -BuildRequires: excalibur-avalon-framework -BuildRequires: excalibur-avalon-logkit -BuildRequires: java-devel >= 0:1.6.0 -BuildRequires: jpackage-utils >= 0:1.7.5 -BuildRequires: geronimo-servlet-2.5-api -BuildRequires: geronimo-jaxrpc-1.1-api +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-collections-tomcat5 +BuildRequires: jakarta-commons-daemon +BuildRequires: jakarta-commons-dbcp-tomcat5 +BuildRequires: jakarta-commons-pool-tomcat5 +BuildRequires: java-devel +BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit -BuildRequires: log4j -BuildRequires: wsdl4j Requires(pre): shadow-utils Requires(pre): shadow-utils -Requires: apache-commons-daemon -Requires: apache-commons-logging -Requires: java >= 0:1.6.0 +Requires: jakarta-commons-daemon +Requires: jakarta-commons-logging +Requires: java Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(post): /lib/lsb/init-functions Requires(preun): /lib/lsb/init-functions -Requires(post): jpackage-utils >= 0:1.7.5 -Requires(postun): jpackage-utils >= 0:1.7.5 %description Tomcat is the servlet container that is used in the official Reference @@ -175,8 +147,6 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp21 -Provides: jsp_api = %{jspspec} -Provides: jsp_2_1_api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -190,11 +160,11 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} -Requires: ecj3 -Requires: %{_javadir}/ecj3.jar -Requires: apache-commons-collections-tomcat5 -Requires: apache-commons-dbcp-tomcat5 -Requires: apache-commons-pool-tomcat5 +Requires: ecj +Requires: %{_javadir}/ecj.jar +Requires: jakarta-commons-collections-tomcat5 +Requires: jakarta-commons-dbcp-tomcat5 +Requires: jakarta-commons-pool-tomcat5 Requires(preun): coreutils %description lib @@ -206,8 +176,6 @@ Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet25 -Provides: servlet_api = %{servletspec} -Provides: servlet_2_5_api Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -225,16 +193,6 @@ %prep %setup -q -c -T -a 0 -for j in $(find . -name "*.jar"); do - mv $j $j.no -done -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/geronimo-spec-jaxrpc-1.1-rc4.jar -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/avalon-framework-4.1.3.jar -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/logkit-1.0.1.jar -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/wsdl4j-1.6.1.jar -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/log4j-1.2.12.jar -#BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/servletapi-2.3.jar - # remove pre-built binaries and windows files find . -type f \( \ -name "*.bat" -o \ @@ -253,9 +211,8 @@ export CLASSPATH= export OPT_JAR_LIST="ant/ant-trax" pushd %{packdname} - ln -s %{SOURCE13} # we don't care about the tarballs and we're going to replace - # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar + # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK # who needs a build.properties file anyway @@ -263,37 +220,21 @@ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ - -Dcommons-daemon.native.src.tgz=%{SOURCE11} \ + -Dcommons-daemon.jsvc.tar.gz="HACK" \ + -Djasper-jdt.jar="$(build-classpath ecj)" \ + -Djdt.jar="$(build-classpath ecj)" \ + -Dtomcat-dbcp.jar="HACK" \ -Dtomcat-native.tar.gz="HACK" \ -Dcommons-daemon.native.src.tgz="HACK" \ - -Djasper-jdt.jar="$(build-classpath ecj3)" \ - -Djdt.jar="$(build-classpath ecj3)" \ - -Dtomcat-dbcp.jar="HACK" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" - - %{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 + output/build/lib/ecj.jar # remove the cruft we created %{__rm} output/build/bin/tomcat-native.tar.gz find -name HACK -exec %{__rm} {} \; @@ -329,18 +270,11 @@ %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{workdir} # move things into place pushd %{packdname}/output/build - %{__mv} bin/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar - %{__ln_s} %{libdir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar - %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd -pushd %{packdname}/output/extras - %{__mv} tomcat-juli.jar tomcat-juli-extras.jar - %{__cp} -a *.jar ${RPM_BUILD_ROOT}%{libdir} -popd # javadoc pushd %{packdname}/output/dist/webapps %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} @@ -356,10 +290,8 @@ %{__install} -m 0644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_initrddir}/%{name} %{__install} -m 0644 %{SOURCE4} \ - ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} -#%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} -%{__install} -m 0644 %{SOURCE8} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} +%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ @@ -379,11 +311,7 @@ /bin/touch el_1_0_api.jar /bin/touch el_api.jar /bin/touch jsp.jar - /bin/touch jsp_api.jar - /bin/touch jsp_2_1_api.jar /bin/touch servlet.jar - /bin/touch servlet_api.jar - /bin/touch servlet_2_5_api.jar %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \ %{name}-jsp-%{jspspec}-api.jar %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \ @@ -429,66 +357,7 @@ %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war %{_bindir}/build-jar-repository ${RPM_BUILD_ROOT}%{libdir} \ - commons-collections-tomcat5 commons-dbcp-tomcat5 commons-pool-tomcat5 ecj3 - -# install poms and depmap frags -%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms - -#Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33.pom -%{__install} -m 0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-annotations-api.pom -%add_to_maven_depmap org.apache.tomcat annotations-api %{version} JPP/%{name} annotations-api - -#Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33.pom -%{__install} -m 0644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina.pom -%add_to_maven_depmap org.apache.tomcat catalina %{version} JPP/%{name} catalina - -#Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.33/catalina-ha-6.0.33.pom -%{__install} -m 0644 %{SOURCE23} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-ha.pom -%add_to_maven_depmap org.apache.tomcat catalina-ha %{version} JPP/%{name} catalina-ha - -#Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.33/coyote-6.0.33.pom -%{__install} -m 0644 %{SOURCE24} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-coyote.pom -%add_to_maven_depmap org.apache.tomcat coyote %{version} JPP/%{name} tomcat-coyote - -#Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.33/dbcp-6.0.33.pom -%{__install} -m 0644 %{SOURCE25} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-commons-dbcp-tomcat6.pom -%add_to_maven_depmap org.apache.tomcat dbcp %{version} JPP/%{name} commons-dbcp-tomcat6 - -#Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33.pom -%{__install} -m 0644 %{SOURCE26} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-el-1.0-api.pom -%add_to_maven_depmap org.apache.tomcat el-api %{version} JPP %{name}-el-1.0-api - -#Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.33/juli-6.0.33.pom -%{__install} -m 0644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-extras.pom -%add_to_maven_depmap org.apache.tomcat juli-extras %{version} JPP/%{name} tomcat-juli-extras - -#Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.33/juli-adapters-6.0.33.pom -%{__install} -m 0644 %{SOURCE28} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-adapters.pom -%add_to_maven_depmap org.apache.tomcat juli-adapters %{version} JPP/%{name} tomcat-juli-adapters - -#Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33.pom -%{__install} -m 0644 %{SOURCE29} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper.pom -%add_to_maven_depmap org.apache.tomcat jasper %{version} JPP/%{name} jasper - -#Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33.pom -%{__install} -m 0644 %{SOURCE30} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper-el.pom -%add_to_maven_depmap org.apache.tomcat jasper-el %{version} JPP/%{name} jasper-el - -#Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33.pom -%{__install} -m 0644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-jsp-2.1-api.pom -%add_to_maven_depmap org.apache.tomcat jsp-api %{version} JPP %{name}-jsp-2.1-api - -#Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.33/juli-6.0.33.pom -%{__install} -m 0644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli.pom -%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli - -#Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33.pom -%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-servlet-2.5-api.pom -%add_to_maven_depmap org.apache.tomcat servlet-api %{version} JPP %{name}-servlet-2.5-api - -#Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.33/tribes-6.0.33.pom -%{__install} -m 0644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-tribes.pom -%add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes + commons-collections-tomcat5 commons-dbcp-tomcat5 commons-pool-tomcat5 ecj %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -500,18 +369,13 @@ -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || : %post -%update_maven_depmap # install but don't activate /sbin/chkconfig --add %{name} -%postun -%update_maven_depmap - %post el-1.0-api %{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar \ el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar \ - el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 +%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 %preun el-1.0-api if [ "$1" = "0" ]; then @@ -524,18 +388,10 @@ %post jsp-%{jspspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_api.jar jsp_api \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_1_api.jar jsp_2_1_api \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 %post servlet-%{servletspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_api.jar servlet_api \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_5_api.jar servlet_2_5_api \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 %post webapps # need to use -p here with b-j-r otherwise the examples webapp fails to @@ -570,20 +426,12 @@ if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar - %{_sbindir}/update-alternatives --remove jsp_api \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar - %{_sbindir}/update-alternatives --remove jsp_2_1_api \ - %{_javadir}/%{name}-jsp-%{jspspec}-api.jar fi %postun servlet-%{servletspec}-api if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar - %{_sbindir}/update-alternatives --remove servlet_api \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar - %{_sbindir}/update-alternatives --remove servlet_2_5_api \ - %{_javadir}/%{name}-servlet-%{servletspec}-api.jar fi %files @@ -613,9 +461,6 @@ %attr(0775,root,tomcat) %dir %{tempdir} %attr(0775,root,tomcat) %dir %{workdir} %{homedir} -%{_datadir}/maven2/poms/* -%{_mavendepmapfragdir}/* - %files admin-webapps %defattr(0644,root,root,0755) @@ -642,8 +487,6 @@ %{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %ghost %{_javadir}/jsp.jar -%ghost %{_javadir}/jsp_2_1_api.jar -%ghost %{_javadir}/jsp_api.jar %files lib %defattr(0644,root,root,0755) @@ -654,8 +497,6 @@ %{_javadir}/%{name}-servlet-%{servletspec}-api-%{version}.jar %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %ghost %{_javadir}/servlet.jar -%ghost %{_javadir}/servlet_2_5_api.jar -%ghost %{_javadir}/servlet_api.jar %files webapps %defattr(0644,root,root,0755) @@ -664,27 +505,13 @@ %{appdir}/sample %changelog -* Sat Jan 07 2012 Ralph Apel <[email protected]> 0:6.0.33-2 -- declare Provides servlet_api, servlet_2_5_api -- declare Provides jsp_api, jsp_2_1_api - -* Thu Oct 13 2011 Ralph Apel <[email protected]> 0:6.0.33-1 -- 6.0.33 - -* Thu Jun 23 2011 Ralph Apel <[email protected]> 0:6.0.32-2 -- Add missing update_maven_depmap - -* Wed Jun 10 2011 Ralph Apel <[email protected]> 0:6.0.32-1 -- 6.0.32 -- Move juli to javadir and symlink to /bin -- Add native -- Add extras -- Add poms and depmap frags -- Switch from jakarta-commons to apache-commons - -* Mon Feb 21 2011 Will Tatam <will.tatam-/[email protected]> 0:6.0.29-1jpp -- 6.0.29 - +* Tue Oct 30 2012 Jason Corley <[email protected]> 0:6.0.36-1jpp +- update copyright date +- 6.0.36 + +* Fri Dec 9 2011 Jason Corley <[email protected]> 0:6.0.35-1jpp +- update copyright date +- 6.0.35 * Fri Oct 08 2010 Will Tatam <will.tatam-/[email protected]> 0:6.0.28-1jpp - 6.0.28 @@ -702,14 +529,6 @@ - fix for https://www.jpackage.org/bugzilla/show_bug.cgi?id=322 - fix for https://www.jpackage.org/bugzilla/show_bug.cgi?id=334 -* Wed Sep 09 2009 Ralph Apel <[email protected]> 0:6.0.18-10 -- Split /usr/sbin/tomcat6 from /usr/sbin/dtomcat6 -- Don't source /etc/tomcat6/tomcat6.conf from /usr/sbin/dtomcat6. -- Settings read from /etc/sysconfig should not be overridden. -- Define TOMCAT_LOG as /var/log/${name}/catalina.out -- Postpone touch and chown of log and pid files to after makeHomeDir -- Thanks sven.kieselbach at t-systems.com - * Fri Jan 16 2009 David Walluck <[email protected]> 0:6.0.18-9 - add el subpackage - own symlinks