rpms/tomcat5/F-10 tomcat5.spec,1.126,1.127

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/tomcat5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267/F-10

Modified Files:
	tomcat5.spec 
Log Message:
fix update ordering, CLASSPATH invocation, bring fixes from F-10 to later branches


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/F-10/tomcat5.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- tomcat5.spec	10 Dec 2008 18:51:18 -0000	1.126
+++ tomcat5.spec	15 Apr 2009 18:06:20 -0000	1.127
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 6.1%{dist}
+Release: 6.2%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -576,7 +576,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
 %if %{without_apisonly}
-export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar":${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar"
 # build initial path structure
 %{__install} -d -m 755 \
     ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
@@ -1361,6 +1361,12 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.27-6.2
+- preserve upgrade ordering, clean up CLASSPATH export
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.5.27-5.9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Dec 10 2008  David Walluck <dwalluck at redhat.com> 0:5.5.27-6.1
 - fix bug #473755
 - fix extra newline in initscript