From ae76542b32bd8bb39b5fbb641aaa43c12a1ea472 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Dec 2016 10:17:55 +0100
Subject: [PATCH] Port to Python 3.6

---
 0001-Don-t-build-and-install-docs.patch       |  4 +--
 ...eneration-of-versioned-OSGi-requires.patch |  4 +--
 0003-Avoid-calling-zipfile.open-.-rU.patch    | 35 +++++++++++++++++++
 javapackages-tools.spec                       |  8 ++++-
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 0003-Avoid-calling-zipfile.open-.-rU.patch

diff --git a/0001-Don-t-build-and-install-docs.patch b/0001-Don-t-build-and-install-docs.patch
index c403735..078fa09 100644
--- a/0001-Don-t-build-and-install-docs.patch
+++ b/0001-Don-t-build-and-install-docs.patch
@@ -1,7 +1,7 @@
 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 1/2] Don't build and install docs
+Subject: [PATCH 1/3] Don't build and install docs
 
 ---
  build   | 2 --
@@ -38,5 +38,5 @@ index bd0a94f..2201038 100755
  (cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
  echo "${prefix}/lib/python?.?/site-packages/javapackages"
 -- 
-2.7.4
+2.9.3
 
diff --git a/0002-Fix-generation-of-versioned-OSGi-requires.patch b/0002-Fix-generation-of-versioned-OSGi-requires.patch
index 6df9bc1..1a0d4b6 100644
--- a/0002-Fix-generation-of-versioned-OSGi-requires.patch
+++ b/0002-Fix-generation-of-versioned-OSGi-requires.patch
@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 2/3] Fix generation of versioned OSGi requires
 
 Fixes #26
 ---
@@ -22,5 +22,5 @@ index cf4534c..c1f791c 100644
          return None
  
 -- 
-2.7.4
+2.9.3
 
diff --git a/0003-Avoid-calling-zipfile.open-.-rU.patch b/0003-Avoid-calling-zipfile.open-.-rU.patch
new file mode 100644
index 0000000..9ec5243
--- /dev/null
+++ b/0003-Avoid-calling-zipfile.open-.-rU.patch
@@ -0,0 +1,35 @@
+From f0196bad669f0a46a33f7fa2f5afb85d00204cf3 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 20 Dec 2016 10:15:38 +0100
+Subject: [PATCH 3/3] Avoid calling zipfile.open(..., "rU")
+
+Fixes: #33
+---
+ python/javapackages/common/manifest.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py
+index 5830d80..9a27ff8 100644
+--- a/python/javapackages/common/manifest.py
++++ b/python/javapackages/common/manifest.py
+@@ -60,7 +60,7 @@ class Manifest(object):
+             try:
+                 jarfile = ZipFile(self._path)
+                 if "META-INF/MANIFEST.MF" in jarfile.namelist():
+-                    mf = jarfile.open("META-INF/MANIFEST.MF", "rU")
++                    mf = jarfile.open("META-INF/MANIFEST.MF", "r")
+             except IOError:
+                 pass
+         if mf is None:
+@@ -93,7 +93,7 @@ class Manifest(object):
+ 
+     def _normalize_manifest(self):
+         lines = []
+-        manifest = self._manifest.split(u'\n')
++        manifest = self._manifest.splitlines()
+         for line in manifest:
+             if line.startswith(' '):
+                 lines[-1] += line.strip()
+-- 
+2.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 946cde7..3ef5db7 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -9,7 +9,7 @@
 
 Name:           javapackages-tools
 Version:        4.7.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -20,6 +20,8 @@ Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{ve
 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
+# https://github.com/fedora-java/javapackages/issues/33
+Patch2:         0003-Avoid-calling-zipfile.open-.-rU.patch
 
 BuildArch:      noarch
 
@@ -125,6 +127,7 @@ This package provides non-essential macros and scripts to support Java packaging
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --pyinterpreter=%{__python3}
@@ -158,6 +161,9 @@ popd
 %{python3_sitelib}/javapackages*
 
 %changelog
+* Tue Dec 20 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.7.0-11
+- Port to Python 3.6
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 4.7.0-10
 - Rebuild for Python 3.6