From 5414203c053acc55e3c5b03ea72e8ef018e491d9 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Jul 02 2015 15:16:41 +0000
Subject: Minor fixes to manifest as we introduce p2.inf file.


Declaring a requirement from the host bundle to the fragment can lead to
problems and most projects instead define a p2.inf file.

---

diff --git a/MANIFEST.MF b/MANIFEST.MF
index a9d77dc..8ab756c 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-SymbolicName: com.kenai.jffi
 Export-Package: com.kenai.jffi;version="@VERSION"
 Bundle-Name: Java Foreign Function Interface
 Bundle-Version: @VERSION
-Require-Bundle: com.kenai.jffi.native
 Bundle-ManifestVersion: 2
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/jffi.spec b/jffi.spec
index 4052ba6..fd2a966 100644
--- a/jffi.spec
+++ b/jffi.spec
@@ -3,7 +3,7 @@
 
 Name:           jffi
 Version:        1.2.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java Foreign Function Interface
 
 License:        LGPLv3+ or ASL 2.0
@@ -11,6 +11,7 @@ URL:            http://github.com/jnr/jffi
 Source0:        https://github.com/%{cluster}/%{name}/archive/%{version}.zip
 Source1:	MANIFEST.MF
 Source2:	NATIVE-MANIFEST.MF
+Source3:	p2.inf
 Patch0:         jffi-fix-dependencies-in-build-xml.patch
 Patch1:         jffi-add-built-jar-to-test-classpath.patch
 Patch2:         jffi-fix-compilation-flags.patch
@@ -74,7 +75,9 @@ cp -p dist/jffi-*-Linux.jar archive/
 %install
 %mvn_install
 
-jar umf MANIFEST.MF %{buildroot}%{_jnidir}/%{name}/%{name}.jar
+mkdir -p META-INF/
+cp %{SOURCE3} META-INF/
+jar umf MANIFEST.MF %{buildroot}%{_jnidir}/%{name}/%{name}.jar META-INF/p2.inf
 
 # install *.so
 install -dm 755 %{buildroot}%{_libdir}/%{name}
@@ -104,6 +107,9 @@ ant -Duse.system.libffi=1 test
 %doc COPYING.GPL COPYING.LESSER LICENSE
 
 %changelog
+* Thu Jun 25 2015 Roland Grunberg <rgrunber@redhat.com> - 1.2.9-7
+- Minor fixes to manifest as we introduce p2.inf file.
+
 * Wed Jun 24 2015 Jeff Johnston <jjohnstn@redhat.com> 1.2.9-6
 - Fix manifests so jffi requires com.kenai.jffi.native and native has bundle version.
 
diff --git a/p2.inf b/p2.inf
new file mode 100644
index 0000000..ede6910
--- /dev/null
+++ b/p2.inf
@@ -0,0 +1,4 @@
+requires.1.namespace = org.eclipse.equinox.p2.iu
+requires.1.name = com.kenai.jffi.native
+requires.1.range = [$version$,$version$]
+requires.1.filter = (&(osgi.os=linux))