rpms/tomcat6/devel servlet-api-OSGi-MANIFEST.MF, NONE, 1.1 tomcat6.spec, 1.7, 1.8

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/tomcat6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4771/devel

Modified Files:
	tomcat6.spec 
Added Files:
	servlet-api-OSGi-MANIFEST.MF 
Log Message:
Add OSGi manifest for servlet-api.


--- NEW FILE servlet-api-OSGi-MANIFEST.MF ---
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"


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tomcat6.spec	25 Feb 2009 21:17:27 -0000	1.7
+++ tomcat6.spec	1 Apr 2009 20:29:13 -0000	1.8
@@ -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 @@
 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 @@
 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 @@
 %{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