[glite-security-util-java] * Fri Jul 30 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.0-2 - Adapt to use tomcat6 on newer re

[stevetraylen]

commit 0c284af15e699c34638d5c4c91c7fb57c8ff6e39
Author: steve <steve at localhost.localdomain>
Date:   Fri Jul 30 19:21:01 2010 +0200

    * Fri Jul 30 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.0-2
    - Adapt to use tomcat6 on newer releases.

 clog                          |    2 ++
 glite-security-util-java.spec |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/clog b/clog
new file mode 100644
index 0000000..fc3b506
--- /dev/null
+++ b/clog
@@ -0,0 +1,2 @@
+* Fri Jul 30 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.0-2
+- Adapt to use tomcat6 on newer releases.
diff --git a/glite-security-util-java.spec b/glite-security-util-java.spec
index 5a0a6b0..d8489e5 100644
--- a/glite-security-util-java.spec
+++ b/glite-security-util-java.spec
@@ -2,7 +2,7 @@
 
 Name:           glite-security-util-java
 Version:        2.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Utilities for GSI Credentials
 
 Group:          System Environment/Libraries
@@ -41,7 +41,7 @@ BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  bouncycastle
 BuildRequires:  log4j
-BuildRequires:  servletapi5
+BuildRequires:  servlet6
 BuildRequires:  axis
 BuildRequires:  vomsjapi
 
@@ -50,7 +50,7 @@ Requires:       java
 Requires:       bouncycastle
 Requires:       log4j
 Requires:       vomsjapi
-Requires:       servletapi5
+Requires:       servlet6
 Requires:       axis
 
 %description
@@ -85,7 +85,7 @@ sed s/org.glite.security.voms.VOMSValidator/org.glite.voms.VOMSValidator/ \
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 
 %build
-export CLASSPATH=$(build-classpath bcprov log4j axis servletapi5 vomsjapi)
+export CLASSPATH=$(build-classpath bcprov log4j axis servlet vomsjapi)
 %ant -Dprefix=build compile-extcp
 %ant -Dprefix=build doc-extcp
 
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 30 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.0-2
+- Adapt to use tomcat6 on newer releases.
+
 * Tue May 25 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.0-1
 - Upstream to 2.8.0