diff --git a/0001-Don-t-build-and-install-docs.patch b/0001-Don-t-build-and-install-docs.patch index 078fa09..5941a90 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 1dbbee792ff2f4915554684097467e10150f2f40 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 6 Sep 2016 12:10:03 +0200 -Subject: [PATCH 1/3] Don't build and install docs +Subject: [PATCH 1/4] 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 index 1a0d4b6..1ce67a4 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 92197a0f3b4eb02ecaaa562a24f3dd698bbf790f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 30 Sep 2016 12:31:40 +0200 -Subject: [PATCH 2/3] Fix generation of versioned OSGi requires +Subject: [PATCH 2/4] Fix generation of versioned OSGi requires Fixes #26 --- diff --git a/0003-Avoid-calling-zipfile.open-.-rU.patch b/0003-Avoid-calling-zipfile.open-.-rU.patch index 9ec5243..54acc28 100644 --- a/0003-Avoid-calling-zipfile.open-.-rU.patch +++ b/0003-Avoid-calling-zipfile.open-.-rU.patch @@ -1,7 +1,7 @@ -From f0196bad669f0a46a33f7fa2f5afb85d00204cf3 Mon Sep 17 00:00:00 2001 +From 9cfefd513b07bea9e0d215db1d58f7b060da5213 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Dec 2016 10:15:38 +0100 -Subject: [PATCH 3/3] Avoid calling zipfile.open(..., "rU") +Subject: [PATCH 3/4] Avoid calling zipfile.open(..., "rU") Fixes: #33 --- diff --git a/0004-Force-locale-in-tests.patch b/0004-Force-locale-in-tests.patch new file mode 100644 index 0000000..144e520 --- /dev/null +++ b/0004-Force-locale-in-tests.patch @@ -0,0 +1,26 @@ +From a8432ff0499c3832246ad7ffcdf9202dc4f29285 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 14 Mar 2017 11:01:57 +0100 +Subject: [PATCH 4/4] Force locale in tests + +--- + test/test_common.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/test_common.py b/test/test_common.py +index 9f7c2fd..914e97b 100644 +--- a/test/test_common.py ++++ b/test/test_common.py +@@ -16,7 +16,8 @@ from lxml import etree + DIRPATH = path.dirname(path.realpath(__file__)) + SCRIPT_ENV = {'PATH':'{mock}:{real}'.format(mock=DIRPATH, + real=os.environ['PATH']), +- 'PYTHONPATH':os.environ['PYTHONPATH']} ++ 'PYTHONPATH':os.environ['PYTHONPATH'], ++ 'LC_ALL': 'C.UTF-8'} + + + def call_script(name, args, stdin=None, extra_env={}): +-- +2.9.3 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index cff496b..3eb59fe 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -10,7 +10,7 @@ Name: javapackages-tools Version: 4.7.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Macros and scripts for Java packaging support @@ -23,6 +23,8 @@ Patch0: 0001-Don-t-build-and-install-docs.patch 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 +# Fixes test failures due to warnings from python +Patch3: 0004-Force-locale-in-tests.patch BuildArch: noarch @@ -131,6 +133,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --pyinterpreter=%{__python3} @@ -172,6 +175,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{python3_sitelib}/javapackages* %changelog +* Tue Mar 14 2017 Michael Simacek - 4.7.0-16 +- Force locale in test to fix failures + * Fri Feb 10 2017 Fedora Release Engineering - 4.7.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild