[felix-osgi-compendium] Move to tomcat 7.x servlet api.

[Alexander Kurtakov]

commit 04c557e53e83e1efcb4af3002f51e7ed6d580cd9
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Mar 21 20:48:54 2012 +0200

    Move to tomcat 7.x servlet api.

 felix-osgi-compendium.demap |    2 +-
 felix-osgi-compendium.spec  |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/felix-osgi-compendium.demap b/felix-osgi-compendium.demap
index aa95da7..69a230c 100644
--- a/felix-osgi-compendium.demap
+++ b/felix-osgi-compendium.demap
@@ -7,7 +7,7 @@
       </maven>
       <jpp>
         <groupId>JPP</groupId>
-        <artifactId>tomcat6-servlet-2.5-api</artifactId>
+        <artifactId>tomcat-servlet-3.0-api</artifactId>
         <version>6.0.26</version>
       </jpp>
     </dependency>
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index 9fd9f52..955506b 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
 
 Group:   Development/Libraries
@@ -31,12 +31,12 @@ BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-foundation
-BuildRequires: servlet25
+BuildRequires: tomcat-servlet-3.0-api
 
 Requires: felix-osgi-core
 Requires: felix-osgi-foundation
 Requires: java >= 1:1.6.0
-Requires: tomcat6-servlet-2.5-api
+Requires: tomcat-servlet-3.0-api
 
 %description
 OSGi Service Platform Release 4 Compendium Interfaces and Classes.
@@ -89,6 +89,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 21 2012 Alexander Kurtakov <akurtako at redhat.com> 1.4.0-9
+- Move to tomcat 7.x servlet api.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild