[nekohtml] Add OSGI Bundle-Name and Bundle-Version to generated manifest

[Jeff Johnston]

commit 17ec9f9fd2fea140101914b776fb2ba896225719
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Mon May 12 13:46:34 2014 -0400

    Add OSGI Bundle-Name and Bundle-Version to generated manifest

 nekohtml-osgi.patch |   12 ++++++++++++
 nekohtml.spec       |   10 ++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/nekohtml-osgi.patch b/nekohtml-osgi.patch
new file mode 100644
index 0000000..4779bff
--- /dev/null
+++ b/nekohtml-osgi.patch
@@ -0,0 +1,12 @@
+diff -up ./build.xml.fix ./build.xml
+--- ./build.xml.fix	2014-05-12 13:07:54.165237445 -0400
++++ ./build.xml	2014-05-12 13:13:07.506517919 -0400
+@@ -128,6 +128,8 @@
+   <mkdir dir='${build.lib.dir}' />
+   <jar jarfile='${jar.file}'>
+ 	<manifest>
++	<attribute name="Bundle-Name" value="${package}" />
++	<attribute name="Bundle-Version" value="${version}" />
+     	<attribute name="Built-By" value="${author}"/>
+     	<section name="org/cyberneko/html/">
+ 		  <attribute name="Specification-Title" value="Hyper-Text Markup Language (HTML)" />
diff --git a/nekohtml.spec b/nekohtml.spec
index c9adb09..94415c9 100644
--- a/nekohtml.spec
+++ b/nekohtml.spec
@@ -30,7 +30,7 @@
 
 Name:           nekohtml
 Version:        1.9.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        HTML scanner and tag balancer
 License:        ASL 2.0
@@ -40,6 +40,8 @@ Source2:        nekohtml-component-info.xml
 Source3:        http://central.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-jars.patch
+# Add proper attributes to MANIFEST.MF file so bundle can be used by other OSGI bundles.
+Patch2:		%{name}-osgi.patch
 
 Requires:       bcel
 Requires:       xerces-j2 >= 0:2.7.1
@@ -88,6 +90,7 @@ Demonstrations and samples for %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2
 find . -name "*.jar" | xargs -t %{__rm}
 %{__perl} -pi -e 's/\r$//g' *.txt doc/*.html
 %{__rm} -r doc/javadoc
@@ -130,6 +133,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2)
 %files demo -f .mfiles-demo
 
 %changelog
+* Mon May 12 2014 Jeff Johnston <jjohnstn at redhat.com> - 0:1.9.20-2
+- Add OSGI Bundle-Name and Bundle-Version to generated manifest
+
 * Tue Mar 18 2014 Michael Simacek <msimacek at redhat.com> - 0:1.9.20-1
 - Update to upstream version 1.9.20
 - Use XMvn for installation
@@ -169,7 +175,7 @@ export CLASSPATH=$(build-classpath bcel xerces-j2)
 - Disable gcj_support
 - Updated nekohtml-jars.patch
 
-* Mon Jul 15 2010 James Laska <jlaska at redhat.com> 0:1.9.14-1
+* Thu Jul 15 2010 James Laska <jlaska at redhat.com> 0:1.9.14-1
 - Update to 1.9.14
 
 * Wed May 13 2009 Martha Benitez <mbenitez at redhat.com> 0:1.9.11-2.2