From c449da3214d9c32709d249a5cd4d4efa76dac6fd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 28 Jan 2016 18:08:34 +0100
Subject: [PATCH] Add OSGi manifest

Related: rhbz#1247265
---
 jakarta-regexp-attach-osgi-manifest.patch | 10 ++++++++++
 jakarta-regexp-osgi-manifest.MF           |  4 ++++
 regexp.spec                               |  9 ++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 jakarta-regexp-attach-osgi-manifest.patch
 create mode 100644 jakarta-regexp-osgi-manifest.MF

diff --git a/jakarta-regexp-attach-osgi-manifest.patch b/jakarta-regexp-attach-osgi-manifest.patch
new file mode 100644
index 0000000..396d6bd
--- /dev/null
+++ b/jakarta-regexp-attach-osgi-manifest.patch
@@ -0,0 +1,10 @@
+--- build.xml~	2007-03-18 23:41:02.000000000 +0100
++++ build.xml	2016-01-28 17:57:22.631161037 +0100
+@@ -102,6 +102,7 @@
+     <!-- =================================================================== -->
+     <target name="jar" depends="compile">
+         <jar jarfile="${build.dir}/${final.name}.jar"
++             manifest="MANIFEST.MF"
+              basedir="${build.dest}"
+              excludes="**/package.html">
+           <metainf dir="." includes="LICENSE,NOTICE"/>
diff --git a/jakarta-regexp-osgi-manifest.MF b/jakarta-regexp-osgi-manifest.MF
new file mode 100644
index 0000000..e8ebfd0
--- /dev/null
+++ b/jakarta-regexp-osgi-manifest.MF
@@ -0,0 +1,4 @@
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.regexp
+Bundle-Version: 1.5.0
+Export-Package: org.apache.regexp;version="1.5.0"
diff --git a/regexp.spec b/regexp.spec
index 3ce2ee5..d21c605 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -1,13 +1,15 @@
 Name:           regexp
 Epoch:          1
 Version:        1.5
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Simple regular expressions API
 License:        ASL 2.0
 URL:            http://jakarta.apache.org/%{name}/
 BuildArch:      noarch
 
 Source0:        http://archive.apache.org/dist/jakarta/%{name}/jakarta-%{name}-%{version}.tar.gz
+Source2:        jakarta-%{name}-osgi-manifest.MF
+Patch0:         jakarta-%{name}-attach-osgi-manifest.patch
 
 BuildRequires:  ant
 BuildRequires:  javapackages-local
@@ -30,6 +32,8 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n jakarta-%{name}-%{version}
+%patch0
+cp -p %{SOURCE2} MANIFEST.MF
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -65,6 +69,9 @@ dummy = posix.readlink(dir) and os.remove(dir)
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 28 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-21
+- Add OSGi manifest
+
 * Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-20
 - Add build-requires on javapackages-local