From a89358e5562f9d634bfbc047512a8f3d5ef91e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 28 May 2017 21:40:55 +0200
Subject: [PATCH] pykickstart: import build "fix" from upstream

QubesOS/qubes-issues#2412
---
 ...gnore-errors-from-coverage-tests-138.patch | 35 +++++++++++++++++++
 pykickstart/pykickstart.spec                  |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pykickstart/0001-Ignore-errors-from-coverage-tests-138.patch

diff --git a/pykickstart/0001-Ignore-errors-from-coverage-tests-138.patch b/pykickstart/0001-Ignore-errors-from-coverage-tests-138.patch
new file mode 100644
index 0000000..3ec4544
--- /dev/null
+++ b/pykickstart/0001-Ignore-errors-from-coverage-tests-138.patch
@@ -0,0 +1,35 @@
+From 4e2d6dcc63dca82fc720849011b72218bdf8d340 Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Mon, 30 Jan 2017 20:18:55 +0100
+Subject: [PATCH] Ignore errors from coverage tests (#138)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Now builds are failing because coverage combine doesn't work on
+Rawhide. It would be nice to find why this is happening but this is not
+a reason for build to fail.
+
+Backported-to-2.23-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 385eb1c..d470f22 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,8 +56,8 @@ endif
+ 	@which $(COVERAGE) || (echo "*** Please install coverage (python3-coverage) ***"; exit 2)
+ 	@echo "*** Running unittests with coverage ***"
+ 	PYTHONPATH=. $(PYTHON) -m nose --with-coverage --cover-erase --cover-branches --cover-package=pykickstart --cover-package=tools $(NOSEARGS)
+-	$(COVERAGE) combine
+-	$(COVERAGE) report -m | tee coverage-report.log
++	-$(COVERAGE) combine
++	-$(COVERAGE) report -m | tee coverage-report.log
+ 	@which mypy || (echo "*** Please install mypy (python3-mypy) ***"; exit 2)
+ 	@echo "*** Running type checks ***"
+ 	PYTHONPATH=. mypy pykickstart
+-- 
+2.7.4
+
diff --git a/pykickstart/pykickstart.spec b/pykickstart/pykickstart.spec
index 8e8d593..7a6769b 100644
--- a/pykickstart/pykickstart.spec
+++ b/pykickstart/pykickstart.spec
@@ -23,6 +23,7 @@ Url:       http://fedoraproject.org/wiki/pykickstart
 # make po-pull && make archive
 # The tarball will be in the current directory.
 Source0:   %{name}-%{version}.tar.gz
+Patch0: 0001-Ignore-errors-from-coverage-tests-138.patch
 Patch2: repo-gpgkey-option.patch
 Patch3: standard-xgettext.patch
 BuildArch: noarch
@@ -77,7 +78,7 @@ the pykickstart package.
 %prep
 %setup -q
 
-#patch0 -p1
+%patch0 -p1
 #patch1 -p1
 %patch2 -p1
 %patch3 -p1