[Jpackage-commits] dist/tomcat6/JPP-5 .cvsignore, 1.3, 1.4 tomcat6.spec, 1.18, 1.19

jpackage jpackage at ryu.zarb.org
Sat Feb 6 17:00:18 CET 2010


Update of /home/projects/jpackage/cvs/dist/tomcat6/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv32472

Modified Files:
	.cvsignore tomcat6.spec 
Log Message:
fix examples webapp by reverting to using -p with b-j-r

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat6/JPP-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	27 Aug 2008 16:42:43 -0000	1.3
--- .cvsignore	6 Feb 2010 16:00:16 -0000	1.4
***************
*** 1 ****
! apache-tomcat-6.0.18-src.tar.gz
--- 1 ----
! apache-tomcat-6.0.24-src.tar.gz

Index: tomcat6.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tomcat6/JPP-5/tomcat6.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** tomcat6.spec	6 Feb 2010 14:57:02 -0000	1.18
--- tomcat6.spec	6 Feb 2010 16:00:16 -0000	1.19
***************
*** 56,60 ****
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
! Release: 1%{?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
  
***************
*** 394,398 ****
  
  %post webapps
! %{_bindir}/build-jar-repository %{appdir}/examples/WEB-INF/lib \
      taglibs-core.jar taglibs-standard.jar 2>&1
  
--- 394,400 ----
  
  %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
  
***************
*** 413,416 ****
--- 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
***************
*** 496,499 ****
--- 505,512 ----
  
  %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




More information about the JPackage-commits mailing list