[Jpackage-commits] rpms/free/tomcat6 tomcat6-6.0-bootstrap-MANIFEST.MF.patch, 1.1, 1.2 tomcat6-6.0.init, 1.7, 1.8 tomcat6-6.0.starter, 1.1, NONE tomcat6-6.0.wrapper, 1.3, 1.4 tomcat6.spec, 1.10, 1.11

jpackage jpackage at ryu.zarb.org
Sat Feb 6 17:14:58 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/tomcat6
In directory ryu.zarb.org:/tmp/1fWhIm2JG0/rpms/free/tomcat6

Modified Files:
	tomcat6-6.0-bootstrap-MANIFEST.MF.patch tomcat6-6.0.init 
	tomcat6-6.0.wrapper tomcat6.spec 
Removed Files:
	tomcat6-6.0.starter 
Log Message:
6.0.24-2.jpp5

Index: tomcat6.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** tomcat6.spec	14 Sep 2009 10:09:34 -0000	1.10
--- tomcat6.spec	6 Feb 2010 16:14:56 -0000	1.11
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,38 ****
  %define major_version 6
  %define minor_version 0
! %define micro_version 18
  %define packdname apache-tomcat-%{version}-src
  %define servletspec 2.5
--- 34,38 ----
  %define major_version 6
  %define minor_version 0
! %define micro_version 24
  %define packdname apache-tomcat-%{version}-src
  %define servletspec 2.5
***************
*** 56,60 ****
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
! Release: 10%{?dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
  
--- 56,60 ----
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
! Release: 2%{?dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
  
***************
*** 70,74 ****
  Source6: %{name}-%{major_version}.%{minor_version}-digest.script
  Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
- Source8: %{name}-%{major_version}.%{minor_version}.starter
  Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
  Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
--- 70,73 ----
***************
*** 196,201 ****
  %setup -q -c -T -a 0
  # remove pre-built binaries and windows files
! find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
!           -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
  pushd %{packdname}
  %patch0 -p0
--- 195,206 ----
  %setup -q -c -T -a 0
  # remove pre-built binaries and windows files
! find . -type f \( \
!     -name "*.bat" -o \
!     -name "*.class" -o \
!     -name "*.gz" -o \
!     -name "*.jar" -o \
!     -name "*.war" -o \
!     -name "*.zip" -o \
!     -name "Thumbs.db" \) | xargs -t %{__rm}
  pushd %{packdname}
  %patch0 -p0
***************
*** 237,243 ****
  pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
  %{__mkdir_p} ../web/WEB-INF/classes
! %{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
  pushd ../web
! %{jar} cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
  popd
  popd
--- 242,250 ----
  pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
  %{__mkdir_p} ../web/WEB-INF/classes
! %{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar \
!     -d ../web/WEB-INF/classes mypackage/Hello.java
  pushd ../web
! %{jar} cf \
!     ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
  popd
  popd
***************
*** 283,290 ****
      ${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}
  %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
      > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
--- 290,295 ----
      ${RPM_BUILD_ROOT}%{_initrddir}/%{name}
  %{__install} -m 0644 %{SOURCE4} \
      ${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}
***************
*** 300,304 ****
      # create jsp and servlet and el API symlinks
      %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar
!     %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api-%{version}.jar
      %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar
      /bin/touch el_1_0_api.jar
--- 305,310 ----
      # create jsp and servlet and el API symlinks
      %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar
!     %{__mv} %{name}/servlet-api.jar \
!         %{name}-servlet-%{servletspec}-api-%{version}.jar
      %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar
      /bin/touch el_1_0_api.jar
***************
*** 306,312 ****
      /bin/touch jsp.jar
      /bin/touch servlet.jar
!     %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar %{name}-jsp-%{jspspec}-api.jar
!     %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar %{name}-servlet-%{servletspec}-api.jar
!     %{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar %{name}-el-%{elspec}-api.jar
  popd
  pushd ${RPM_BUILD_ROOT}%{libdir}
--- 312,321 ----
      /bin/touch jsp.jar
      /bin/touch servlet.jar
!     %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \
!         %{name}-jsp-%{jspspec}-api.jar
!     %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \
!         %{name}-servlet-%{servletspec}-api.jar
!     %{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar \
!         %{name}-el-%{elspec}-api.jar
  popd
  pushd ${RPM_BUILD_ROOT}%{libdir}
***************
*** 347,352 ****
  %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
  
! %{_bindir}/build-jar-repository -p ${RPM_BUILD_ROOT}%{libdir} commons-collections-tomcat5 \
!     commons-dbcp-tomcat5 commons-pool-tomcat5 ecj
  
  %clean
--- 356,361 ----
  %{__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 ecj
  
  %clean
***************
*** 364,374 ****
  
  %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
  
  %preun el-1.0-api
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
!     %{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
  fi
  
--- 373,386 ----
  
  %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
  
  %preun el-1.0-api
  if [ "$1" = "0" ]; then
!     %{_sbindir}/update-alternatives --remove el_api \
!         %{_javadir}/%{name}-el-%{elspec}-api.jar
!     %{_sbindir}/update-alternatives --remove el_1_0_api \
!         %{_javadir}/%{name}-el-%{elspec}-api.jar
  fi
  
***************
*** 382,385 ****
--- 394,399 ----
  
  %post webapps
+ # need to use -p here with b-j-r otherwise the examples webapp fails to
+ # load with a java.io.IOException
  %{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
      taglibs-core.jar taglibs-standard.jar 2>&1
***************
*** 401,404 ****
--- 415,425 ----
  fi
  
+ %preun webapps
+ if [ "$1" = "0" ]; then
+     # these do not have brackets due to b-j-r -p usage
+     %{__rm} %{appdir}/examples/WEB-INF/lib/taglibs-core.jar \
+         %{appdir}/examples/WEB-INF/lib/taglibs-standard.jar
+ fi
+ 
  %postun jsp-%{jspspec}-api
  if [ "$1" = "0" ]; then
***************
*** 484,494 ****
  
  %changelog
! * Wed Sep 09 2009 Ralph Apel <r.apel at r-apel.de> 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 <dwalluck at redhat.com> 0:6.0.18-9
--- 505,517 ----
  
  %changelog
! * Sat Feb  6 2010 Jason Corley <jason.corley at gmail.com> 0:6.0.24-2jpp
! - revert to b-j-r -p usage on examples webapp and document reason
! - add preun for examples webapp
! 
! * Sat Feb  6 2010 Jason Corley <jason.corley at gmail.com> 0:6.0.24-1jpp
! - update copyright to 2010
! - wrap a couple of really long lines
! - fix for https://www.jpackage.org/bugzilla/show_bug.cgi?id=322
! - fix for https://www.jpackage.org/bugzilla/show_bug.cgi?id=334
  
  * Fri Jan 16 2009 David Walluck <dwalluck at redhat.com> 0:6.0.18-9

Index: tomcat6-6.0-bootstrap-MANIFEST.MF.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6-6.0-bootstrap-MANIFEST.MF.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** tomcat6-6.0-bootstrap-MANIFEST.MF.patch	18 Sep 2008 17:50:36 -0000	1.1
--- tomcat6-6.0-bootstrap-MANIFEST.MF.patch	6 Feb 2010 16:14:56 -0000	1.2
***************
*** 1,8 ****
! --- res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
! +++ res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
  @@ -1,5 +1,4 @@
   Manifest-Version: 1.0
   Main-Class: org.apache.catalina.startup.Bootstrap
! -Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-coyote.jar
   Specification-Title: Catalina
!  Specification-Version: 6.0
--- 1,10 ----
! --- res/META-INF/bootstrap.jar.manifest.orig	2010-02-05 01:55:20.000000000 -0500
! +++ res/META-INF/bootstrap.jar.manifest	2010-02-05 01:55:27.000000000 -0500
  @@ -1,5 +1,4 @@
   Manifest-Version: 1.0
   Main-Class: org.apache.catalina.startup.Bootstrap
! -Class-Path: commons-daemon.jar tomcat-juli.jar
   Specification-Title: Catalina
! -Specification-Version: 6.0
! \ No newline at end of file
! +Specification-Version: 6.0

Index: tomcat6-6.0.init
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6-6.0.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** tomcat6-6.0.init	14 Sep 2009 10:09:34 -0000	1.7
--- tomcat6-6.0.init	6 Feb 2010 16:14:56 -0000	1.8
***************
*** 59,63 ****
  
  # Path to the tomcat launch script
! TOMCAT_SCRIPT="/usr/sbin/dtomcat6"
  
  # Tomcat program name
--- 59,63 ----
  
  # Path to the tomcat launch script
! TOMCAT_SCRIPT="/usr/sbin/tomcat6"
  
  # Tomcat program name
***************
*** 68,74 ****
  
  # Define the tomcat log file
! TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}"
! # Define the tomcat pid file
! export CATALINA_PID="/var/run/${NAME}.pid"
  
  RETVAL="0"
--- 68,72 ----
  
  # Define the tomcat log file
! TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
  
  RETVAL="0"
***************
*** 118,123 ****
          ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work
          ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
!         cp -pLR /usr/share/tomcat6/bin $CATALINA_HOME
!         cp -pLR /usr/share/tomcat6/conf $CATALINA_HOME
          ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
          ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
--- 116,121 ----
          ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work
          ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
!         cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
!         cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
          ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
          ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
***************
*** 158,161 ****
--- 156,165 ----
          fi
      fi
+     # fix permissions on the log and pid files
+     export CATALINA_PID="/var/run/${NAME}.pid"
+     touch $CATALINA_PID
+     chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
+     touch $TOMCAT_LOG
+     chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
      if [ "$CATALINA_HOME" != "/usr/share/tomcat6" ]; then
          # Create a tomcat directory if it doesn't exist
***************
*** 168,176 ****
              ${CATALINA_HOME}/conf/server.xml
      fi
-     # fix permissions on the log and pid files
-     touch $TOMCAT_LOG
-     chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
-     touch $CATALINA_PID
-     chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
      parseOptions
      if [ "$SECURITY_MANAGER" = "true" ]; then
--- 172,175 ----

Index: tomcat6-6.0.wrapper
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6-6.0.wrapper,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** tomcat6-6.0.wrapper	14 Sep 2009 10:09:34 -0000	1.3
--- tomcat6-6.0.wrapper	6 Feb 2010 16:14:56 -0000	1.4
***************
*** 8,19 ****
  fi
  
! ## Get the tomcat config (use this for environment specific settings)
! #if [ -z "${TOMCAT_CFG}" ]; then
! #  TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
! #fi
! #
! #if [ -r "$TOMCAT_CFG" ]; then
! #  . $TOMCAT_CFG
! #fi
  
  set_javacmd
--- 8,19 ----
  fi
  
! # Get the tomcat config (use this for environment specific settings)
! if [ -z "${TOMCAT_CFG}" ]; then
!   TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
! fi
! 
! if [ -r "$TOMCAT_CFG" ]; then
!   . $TOMCAT_CFG
! fi
  
  set_javacmd

--- tomcat6-6.0.starter DELETED ---




More information about the JPackage-commits mailing list