From e4112cee71d37293b84a6a4e49396177ce963bc4 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: May 29 2015 12:25:33 +0000
Subject: Compile and depend on glassfish-servlet-api instead of tomcat.


---

diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index b89e89f..fd969d8 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -46,7 +46,7 @@ Patch1:      avalon-logkit-pom-deps.patch
 Patch2:      avalon-logkit-encoding.patch
 Patch3:      java7.patch
 Requires:    avalon-framework >= 0:4.1.4
-Requires:    tomcat-servlet-3.1-api
+Requires:    glassfish-servlet-api
 Requires:    jms
 Requires:    javamail
 
@@ -58,7 +58,7 @@ BuildRequires:    log4j
 BuildRequires:    avalon-framework >= 0:4.1.4
 # Required for converting jars to OSGi bundles
 BuildRequires:    aqute-bnd
-BuildRequires:    tomcat-servlet-3.1-api
+BuildRequires:    glassfish-servlet-api
 BuildRequires:    jms
 
 BuildArch:    noarch
@@ -92,7 +92,7 @@ find . -name "*.jar" -exec rm -f {} \;
 rm -rf src/java/org/apache/log/output/lf5
 
 %build
-export CLASSPATH=$(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
+export CLASSPATH=$(build-classpath log4j javamail/mailapi jms glassfish-servlet-api jdbc-stdext avalon-framework junit):$PWD/build/classes
 ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc
 # Convert to OSGi bundle
 java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
@@ -119,6 +119,9 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri May 29 2015 Alexander Kurtakov <akurtako@redhat.com> 0:2.1-18
+- Compile and depend on glassfish-servlet-api instead of tomcat.
+
 * Wed Mar 4 2015 Alexander Kurtakov <akurtako@redhat.com> 0:2.1-18
 - Bump to servlet 3.1.