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 @@ - commons-el - commons-el - 1.0 - - - JPP - commons-el - 1.0 - - - - mx4j mx4j 3.0.1 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 6.1.26-5 +- Do not require tomcat6-lib. +- Drop one depmap. + * Tue Dec 14 2010 Alexander Kurtakov 6.1.26-4 - Do not require apache-commons-parent in order to not bring maven and friends.