diff --git a/0001-maven_depmap-Open-existing-metadata-in-binary-mode.patch b/0001-maven_depmap-Open-existing-metadata-in-binary-mode.patch new file mode 100644 index 0000000..77788ad --- /dev/null +++ b/0001-maven_depmap-Open-existing-metadata-in-binary-mode.patch @@ -0,0 +1,25 @@ +From 88865fc14c8cdd9e43b35daf056df5b9b93ba0e5 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 13 Feb 2015 06:48:10 +0100 +Subject: [PATCH] [maven_depmap] Open existing metadata in binary mode + +--- + java-utils/maven_depmap.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py +index 78fe643..9094c22 100644 +--- a/java-utils/maven_depmap.py ++++ b/java-utils/maven_depmap.py +@@ -192,7 +192,7 @@ def write_metadata(metadata_file, artifacts): + xml = gzip.open(metadata_file, 'rb').read() + except IOError: + # Not a gzipped file? +- xml = open(metadata_file, "r").read() ++ xml = open(metadata_file, "rb").read() + # FIXME make proper support for multiple model versions + xml = xml.replace(b'http://fedorahosted.org/xmvn/METADATA/2.0.0', + b'http://fedorahosted.org/xmvn/METADATA/2.3.0') +-- +2.1.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9dcb3df..dc3ff98 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -9,7 +9,7 @@ Name: javapackages-tools Version: 4.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Macros and scripts for Java packaging support @@ -21,6 +21,7 @@ Patch1: 0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch Patch2: 0003-Add-compatibility-with-lua-5.3.0.patch # XXX temporary workaround Patch3: 0001-Workaround-for-XMvn-version-bump-rhbz-1191657.patch +Patch4: 0001-maven_depmap-Open-existing-metadata-in-binary-mode.patch BuildArch: noarch @@ -183,6 +184,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %if 0%{?with_python3} @@ -237,6 +239,9 @@ popd %doc LICENSE %changelog +* Fri Feb 13 2015 Michal Srb - 4.3.2-6 +- Fix TypeError in maven_depmap (see: rhbz#1191657) + * Thu Feb 12 2015 Michael Simacek - 4.3.2-5 - Workaround for XMvn version bump (rhbz#1191657)