Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10)

el-api-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: javax.el;version="2.2.0"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 2.2.0
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: javax.el
-DynamicImport-Package: org.apache.el
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

jasper-OSGi-MANIFEST.MF

@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.jasper;version="8.0.26",org.apache.jasper.c
- ompiler;version="8.0.26",org.apache.jasper.compiler.tagplugin;version
- ="8.0.26",org.apache.jasper.resources;version="8.0.26",org.apache.jas
- per.runtime;version="8.0.26",org.apache.jasper.security;version="7.0.
- 19",org.apache.jasper.servlet;version="8.0.26",org.apache.jasper.tagp
- lugins.jstl;version="8.0.26",org.apache.jasper.tagplugins.jstl.core;v
- ersion="8.0.26",org.apache.jasper.util;version="8.0.26",org.apache.ja
- sper.xmlparser;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Localization: plugin
-Bundle-Name: %bundleName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.jasper
-Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h
- ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0
- ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re
- sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2
- .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax.
- xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache.
- commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti
- on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a
- pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;
- resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.
- sax.helpers,org.apache.tomcat;version="8.0.26",org.apache.juli.loggin
- g;version="8.0.26",javax.el;version="2.2.0",org.eclipse.jdt.internal.
- compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int
- ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow
- ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp
- iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in
- ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e
- clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil
- er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte
- rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt.
- core.compiler
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

jasper-el-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.el;version="7.0.21"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: javax.el;version="2.2"
-Bundle-SymbolicName: org.apache.el
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

jsp-api-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-Name: %bundleName
-Bundle-SymbolicName: javax.servlet.jsp
-Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
- ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
- .tagext; version=2.2
-Bundle-Version: 2.2.0.v200806031607
-Bundle-ManifestVersion: 2
-Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
- =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0"

servlet-api-OSGi-MANIFEST.MF

@@ -1,17 +0,0 @@
-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: 3.0.0
-Bundle-Vendor: %bundleProvider
-Export-Package: javax.servlet;version="3.0",
- javax.servlet;version="2.6",
- javax.servlet.http;version="3.0",
- javax.servlet.http;version="2.6",
- javax.servlet.annotation;version="2.6",
- javax.servlet.descriptor;version="3.0",
- javax.servlet.descriptor;version="2.6",
- javax.servlet.resources;version="3.0",
- javax.servlet.resources;version="2.6"

tomcat-api-OSGi-MANIFEST.MF

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.tomcat;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.tomcat
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

tomcat-juli-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.juli;version="8.0.26",org.apache.juli.loggi
- ng;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.juli
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

tomcat.spec

@@ -74,14 +74,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
-Source9:       jsp-api-OSGi-MANIFEST.MF
 Source11:      %{name}-%{major_version}.%{minor_version}.service
-Source12:      el-api-OSGi-MANIFEST.MF
-Source13:      jasper-el-OSGi-MANIFEST.MF
-Source14:      jasper-OSGi-MANIFEST.MF
-Source15:      tomcat-api-OSGi-MANIFEST.MF
-Source16:      tomcat-juli-OSGi-MANIFEST.MF
 Source20:      %{name}-%{major_version}.%{minor_version}-jsvc.service
 Source21:      tomcat-functions
 Source30:      tomcat-preamble
@@ -285,30 +278,6 @@ pushd ../web
 popd
 popd
 
-# inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE8} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE9} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE12} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/el-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE13} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/jasper-el.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE14} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/jasper.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE15} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE16} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
-
 %install
 # build initial path structure
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
@@ -680,6 +649,9 @@ fi
 %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
 
 %changelog
+* Wed Feb 20 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.13-3
+- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10)
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild