[glite-security-trustmanager] change to tomcat6.

[stevetraylen]

commit 156836a7446ab2435f12f34340ac9a3ad9aafb26
Author: Steve Traylen <steve at bottom.home>
Date:   Tue Aug 3 18:30:40 2010 +0200

    change to tomcat6.

 glite-security-trustmanager.spec |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/glite-security-trustmanager.spec b/glite-security-trustmanager.spec
index 4a4860f..857fb2e 100644
--- a/glite-security-trustmanager.spec
+++ b/glite-security-trustmanager.spec
@@ -2,7 +2,7 @@
 
 Name:           glite-security-trustmanager
 Version:        2.5.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java trustmanager interface supporting a GSI grid name space
 
 Group:          System Environment/Libraries
@@ -42,9 +42,9 @@ BuildRequires:  axis
 BuildRequires:  bouncycastle
 BuildRequires:  log4j
 BuildRequires:  vomsjapi
-BuildRequires:  servletapi5
+BuildRequires:  servlet6
 BuildRequires:  glite-security-util-java >= 2.5.5
-BuildRequires:  tomcat5-server-lib
+BuildRequires:  tomcat6-server-lib
 
 Requires:       java >= 1:1.6.0
 Requires:       vomsjapi
@@ -53,7 +53,7 @@ Requires:       axis
 Requires:       bouncycastle
 Requires:       log4j
 Requires:       glite-security-util-java >= 2.5.5
-Requires:       servletapi5
+Requires:       servlet6
 
 %if 0%{?el5}
 ExcludeArch: ppc
@@ -71,16 +71,16 @@ in glite-security-util-java. It can be used both in the server side for
 the server SSL handler and on the client side for the opening of SSL 
 connections. 
 
-%package tomcat5
+%package tomcat6
 Summary: Java trustmanager interface supporting a GSI grid name space
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: tomcat5
+Requires: tomcat6
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildArch:      noarch
 %endif
 
-%description tomcat5
+%description tomcat6
 glite-security-trustmanager together with glite-security-util-java is 
 an implementation of the java TrustManager interface with implementation 
 of cert path checking, grid name space restrictions and dynamic loading
@@ -90,7 +90,7 @@ are many utility classes and methods for certificate and proxy handling
 in util-java. It can be used both in the server side for the server SSL 
 handler and on the client side for the opening of SSL connections. 
 
-glite-security-trustmanager-tomcat5 provides the necessary files
+glite-security-trustmanager-tomcat6 provides the necessary files
 for a tomcat connector to be set up.
 
 
@@ -114,7 +114,7 @@ cp %{SOURCE1} .
 cp %{SOURCE2} .
 
 %build
-export CLASSPATH=$(build-classpath vomsjapi tomcat5 glite-security-util-java servletapi5 commons-logging bcprov log4j axis)
+export CLASSPATH=$(build-classpath vomsjapi tomcat6 glite-security-util-java servlet commons-logging bcprov log4j axis)
 %ant -q -Dprefix=build compile-extcp
 %ant -Dprefix=build doc-extcp
 
@@ -148,14 +148,14 @@ cp -p %{name}-log4j.properties $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/trustmanag
   fi
 %endif
 
-%post tomcat5
+%post tomcat6
 # This is bad packaging: The symbolic links created below are needed
 # but they are not cleaned up when the package is removed and it is not
 # obvious that removing them will do more harm than good.
-# tomcat5 seems to be perfectly happy to run with dangling symlinks 
-# and they are cleaned up when the tomcat5 package itself is removed.
+# tomcat6 seems to be perfectly happy to run with dangling symlinks 
+# and they are cleaned up when the tomcat6 package itself is removed.
 
-build-jar-repository /var/lib/tomcat5/server/lib log4j bcprov vomsjapi  \
+build-jar-repository /var/lib/tomcat6/server/lib log4j bcprov vomsjapi  \
       glite-security-util-java %{name}
 
 %postun
@@ -181,7 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/%{name}/trustmanager-log4j.properties
 %doc LICENSE doc/USAGE
 
-%files tomcat5
+%files tomcat6
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/grid-security
 %dir %{_sysconfdir}/grid-security/%{name}
@@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug 3 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-5
+- Adapt to switch to tomcat6.
+
 * Thu May 27 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-4
 - Don't build for ppc on .el5.