[java-sig-commits] [jetty] Do not require tomcat6-lib.

[Alexander Kurtakov]

commit 0439d3eb6077259c20e8307d573559bd0d35c98c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Dec 20 10:15:58 2010 +0200

    Do not require tomcat6-lib.
    
    Drop one depmap.

 jetty-depmap.xml |   12 ------------
 jetty.spec       |    9 +++++----
 2 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index a5fc441..2c6e256 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -105,18 +105,6 @@
 	</dependency>
 	<dependency>
 		<maven>
-			<groupId>commons-el</groupId>
-			<artifactId>commons-el</artifactId>
-			<version>1.0</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>commons-el</artifactId>
-			<version>1.0</version>
-		</jpp>
-	</dependency>
-	<dependency>
-		<maven>
 			<groupId>mx4j</groupId>
 			<artifactId>mx4j</artifactId>
 			<version>3.0.1</version>
diff --git a/jetty.spec b/jetty.spec
index d6049fb..48d4878 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.26
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -82,7 +82,6 @@ BuildRequires: maven-plugin-bundle
 BuildRequires: maven-release-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-shared-dependency-tree
-BuildRequires: tomcat6-lib
 BuildRequires: servlet25
 BuildRequires: jsp21
 BuildRequires: slf4j
@@ -99,8 +98,6 @@ Requires:  jpackage-utils >= 0:1.6
 Requires:  ant >= 0:1.6
 Requires:  apache-commons-el
 Requires:  apache-commons-logging
-Requires:  tomcat6-lib >= 6.0.26
-Requires:  jsp
 Requires:  mx4j >= 0:3.0
 Requires: servlet25
 Requires: jsp21
@@ -374,6 +371,10 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Dec 20 2010 Alexander Kurtakov <akurtako at redhat.com> 6.1.26-5
+- Do not require tomcat6-lib.
+- Drop one depmap.
+
 * Tue Dec 14 2010 Alexander Kurtakov <akurtako at redhat.com> 6.1.26-4
 - Do not require apache-commons-parent in order to not bring maven and friends.