[java-sig-commits] [tomcat: 9/66] Add OSGi manifest for servlet-api.

[Ivan Afonichev]

commit f999669ccb45265d815f783001864652e64fc652
Author: Alexander Kurtakov <akurtakov at fedoraproject.org>
Date:   Wed Apr 1 20:29:13 2009 +0000

    Add OSGi manifest for servlet-api.

 servlet-api-OSGi-MANIFEST.MF |   10 ++++++++++
 tomcat6.spec                 |   12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..957cb38
--- /dev/null
+++ b/servlet-api-OSGi-MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
+Bundle-SymbolicName: javax.servlet
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-Version: 2.5.0.v200806031605
+Bundle-Vendor: %bundleProvider
+Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
+ ="2.5",javax.servlet.resources;version="2.5"
diff --git a/tomcat6.spec b/tomcat6.spec
index c776460..3b5f1e7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 9.1%{?dist}
+Release: 9.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -68,6 +68,7 @@ Source4: %{name}-%{major_version}.%{minor_version}.wrapper
 Source5: %{name}-%{major_version}.%{minor_version}.logrotate
 Source6: %{name}-%{major_version}.%{minor_version}-digest.script
 Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
+Source8: servlet-api-OSGi-MANIFEST.MF
 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -225,6 +226,12 @@ pushd ../web
 popd
 popd
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 # build initial path structure
@@ -440,6 +447,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Wed Apr 1 2009 akurtakov <akurtakov at dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
+- Add OSGi manifest for servlet-api.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:6.0.18-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild