From 987256c9a62332b8f33cf2478b16f9c62d700456 Mon Sep 17 00:00:00 2001
From: Gerard Ryan <gerard@ryan.lt>
Date: Wed, 27 Jun 2012 14:40:30 +0100
Subject: [PATCH] Inject OSGI Manifest for xalan-j2.jar

---
 xalan-j2-MANIFEST.MF | 39 +++++++++++++++++++++++++++++++++++++++
 xalan-j2.spec        | 13 ++++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 xalan-j2-MANIFEST.MF

diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF
new file mode 100644
index 0000000..7392c01
--- /dev/null
+++ b/xalan-j2-MANIFEST.MF
@@ -0,0 +1,39 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.2
+Created-By: 1.7.0_b147-icedtea (Oracle Corporation)
+Main-Class: org.apache.xalan.xslt.Process
+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.apache.xalan
+Bundle-Version: 2.7.1
+Bundle-Vendor: %Bundle-Vendor.0
+Export-Package: org.apache.xalan,
+ org.apache.xml,
+ org.apache.xpath
+Require-Bundle: org.apache.xerces
+Eclipse-BuddyPolicy: registered
+
+Name: org/apache/xalan/
+Comment: Main Xalan engine implementing TrAX/JAXP
+Specification-Title: Java API for XML Processing
+Specification-Vendor: Sun Microsystems Inc.
+Specification-Version: 1.3
+Implementation-Title: org.apache.xalan
+Implementation-Version: 2.7.1
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/dist/
+
+Name: org/apache/xml/
+Comment: DTM implementation and utilities
+Implementation-Title: org.apache.xml
+Implementation-Version: 2.7.1
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/dist/
+
+Name: org/apache/xpath/
+Comment: XPath engine
+Implementation-Title: org.apache.xpath
+Implementation-Version: 2.7.1
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: http://xml.apache.org/xalan-j/dist/
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 6136fc7..071841f 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # samples/servlet/ApplyXSLTException.java is ASL 1.1
@@ -41,8 +41,9 @@ License:        ASL 1.1 and ASL 2.0 and W3C
 Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
 Source1:        %{name}-serializer-MANIFEST.MF
 Source2:        http://repo1.maven.org/maven2/xalan/xalan/2.7.1/xalan-2.7.1.pom
-Source3:        http://repo1.maven.org/maven2/xalan/xalan/2.7.1/serializer-2.7.1.pom
+Source3:        http://repo1.maven.org/maven2/xalan/serializer/2.7.1/serializer-2.7.1.pom
 Source4:        xsltc-%{version}.pom
+Source5:	%{name}-MANIFEST.MF
 Patch0:         %{name}-noxsltcdeps.patch
 # Fix the serializer JAR filename in xalan-j2's MANIFEST.MF
 # https://bugzilla.redhat.com/show_bug.cgi?id=718738
@@ -63,7 +64,7 @@ BuildRequires:  jlex
 BuildRequires:  java_cup
 BuildRequires:  regexp
 BuildRequires:  sed
-BuildRequires:  javax.servlet 
+BuildRequires:  geronimo-osgi-support
 BuildRequires:  xerces-j2 >= 0:2.7.1
 BuildRequires:  xml-commons-apis >= 0:1.3
 BuildRequires:  xml-stylebook
@@ -161,6 +162,9 @@ mkdir -p META-INF
 cp -p %{SOURCE1} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
 zip -u build/serializer.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE5} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/xalan-interpretive.jar META-INF/MANIFEST.MF
 
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -237,6 +241,9 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 24 2012 Gerard Ryan <galileo@fedoraproject.org> - 0:2.7.1-10
+- Inject OSGI Manifest for xalan-j2.jar
+
 * Tue May 29 2012 Andy Grimm <agrimm@gmail.com> - 0:2.7.1-9
 - Follow new guidelines for EE API deps (#819546)