From c5c252bdb3ef9f1eb0449b528e8bb84d25567c79 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 3 Oct 2016 06:51:10 +0200
Subject: [PATCH] Fix generation of versioned OSGi requires

---
 0001-Don-t-build-and-install-docs.patch       |  4 +--
 ...eneration-of-versioned-OSGi-requires.patch | 26 +++++++++++++++++++
 javapackages-tools.spec                       |  8 +++++-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 0002-Fix-generation-of-versioned-OSGi-requires.patch

diff --git a/0001-Don-t-build-and-install-docs.patch b/0001-Don-t-build-and-install-docs.patch
index 00d2449..c403735 100644
--- a/0001-Don-t-build-and-install-docs.patch
+++ b/0001-Don-t-build-and-install-docs.patch
@@ -1,7 +1,7 @@
-From 53ea1889544af0d25b525816eb498a70961e73aa Mon Sep 17 00:00:00 2001
+From 4d9f077d16ad9f10ed457f1659015f120b3489ac Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Tue, 6 Sep 2016 12:10:03 +0200
-Subject: [PATCH] Don't build and install docs
+Subject: [PATCH 1/2] Don't build and install docs
 
 ---
  build   | 2 --
diff --git a/0002-Fix-generation-of-versioned-OSGi-requires.patch b/0002-Fix-generation-of-versioned-OSGi-requires.patch
new file mode 100644
index 0000000..6df9bc1
--- /dev/null
+++ b/0002-Fix-generation-of-versioned-OSGi-requires.patch
@@ -0,0 +1,26 @@
+From 14a281a4ada0a175eebbf9601d42b2d882fc11d6 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 30 Sep 2016 12:31:40 +0200
+Subject: [PATCH 2/2] Fix generation of versioned OSGi requires
+
+Fixes #26
+---
+ python/javapackages/cache/osgi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/javapackages/cache/osgi.py b/python/javapackages/cache/osgi.py
+index cf4534c..c1f791c 100644
+--- a/python/javapackages/cache/osgi.py
++++ b/python/javapackages/cache/osgi.py
+@@ -61,7 +61,7 @@ class OSGiCache(Cache):
+ 
+     def get_bundle(self, name):
+         for bundle in self._cache.values():
+-            if bundle == name:
++            if bundle.bundle == name:
+                 return bundle
+         return None
+ 
+-- 
+2.7.4
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index b61f3bc..4c0c015 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -9,7 +9,7 @@
 
 Name:           javapackages-tools
 Version:        4.7.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -18,6 +18,8 @@ URL:            https://git.fedorahosted.org/git/javapackages.git
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
 Patch0:         0001-Don-t-build-and-install-docs.patch
+# Upstream patch for https://github.com/fedora-java/javapackages/issues/26
+Patch1:         0002-Fix-generation-of-versioned-OSGi-requires.patch
 
 BuildArch:      noarch
 
@@ -121,6 +123,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %setup -q -n javapackages-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --pyinterpreter=%{__python3}
@@ -154,6 +157,9 @@ popd
 %{python3_sitelib}/javapackages*
 
 %changelog
+* Mon Oct  3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.7.0-8
+- Fix generation of versioned OSGi requires
+
 * Tue Sep 06 2016 Michael Simacek <msimacek@redhat.com> - 4.7.0-7
 - Remove docs, which were split into java-packaging-howto