From b1a9f4b883967f2d9b09fc66efdc754c1888ca3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 14 Jan 2019 09:25:23 +0100
Subject: [PATCH] Use python deps generator correctly

---
 ...Only-require-enum34-on-Legacy-Python.patch | 39 +++++++++++++++++++
 pungi.spec                                    | 16 ++++----
 2 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 0001-Only-require-enum34-on-Legacy-Python.patch

diff --git a/0001-Only-require-enum34-on-Legacy-Python.patch b/0001-Only-require-enum34-on-Legacy-Python.patch
new file mode 100644
index 00000000..90a0cd55
--- /dev/null
+++ b/0001-Only-require-enum34-on-Legacy-Python.patch
@@ -0,0 +1,39 @@
+From 3fe4beb20c50fb54cef31b3cd0e2946067aeb09e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Mon, 14 Jan 2019 09:13:59 +0100
+Subject: [PATCH] Only require enum34 on Legacy Python
+
+This resolves https://bugzilla.redhat.com/show_bug.cgi?id=1665501
+
+Signed-off-by: Why Do You <enforce@this.qm>
+---
+ setup.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 83414556..ab4da262 100755
+--- a/setup.py
++++ b/setup.py
+@@ -57,7 +57,6 @@ setup(
+     ],
+     test_suite      = "tests",
+     install_requires = [
+-        "enum34",
+         "jsonschema",
+         "kobo",
+         "lockfile",
+@@ -67,6 +66,11 @@ setup(
+         'dogpile.cache',
+         'dict.sorted',
+         ],
++    extras_require={
++        ':python_version=="2.7"': [
++            'enum34'
++        ]
++    },
+     tests_require = [
+         "mock",
+         "nose",
+-- 
+2.17.2
+
diff --git a/pungi.spec b/pungi.spec
index 065cef1e..0770d41e 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,6 +1,8 @@
+%{?python_enable_dependency_generator}
+
 Name:           pungi
 Version:        4.1.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -8,6 +10,7 @@ License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         0001-Make-sure-basearch-is-also-replaced-with-config-ostr.patch
+Patch1:         0001-Only-require-enum34-on-Legacy-Python.patch
 
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock
@@ -37,7 +40,6 @@ BuildRequires:  python3-libmodulemd
 BuildRequires:  python3-libmodulemd1
 %endif
 BuildRequires:  python3-gobject
-BuildRequires:  python3-pdc-client
 BuildRequires:  python3-createrepo_c
 BuildRequires:  python3-dogpile-cache
 BuildRequires:  python3-parameterized
@@ -53,23 +55,18 @@ BuildRequires:  tex(tabulary.sty)
 BuildRequires:  tex(needspace.sty)
 BuildRequires:  latexmk
 
-Requires:       python3-kobo >= 0.6
 Requires:       python3-kobo-rpmlib
-Requires:       python3-productmd >= 1.17
 Requires:       python3-kickstart
 Requires:       createrepo_c
-Requires:       python3-lxml
 Requires:       koji >= 1.10.1-13
 Requires:       python3-koji-cli-plugins
 Requires:       isomd5sum
 Requires:       genisoimage
 Requires:       git
-Requires:       python3-jsonschema
 Requires:       libguestfs-tools-c
 Requires:       python3-dnf
 Requires:       python3-multilib
 Requires:       python3-libcomps
-Requires:       python3-six
 Requires:       python3-koji
 %if 0%{?fedora} <  30
 Requires:       python3-libmodulemd
@@ -77,10 +74,8 @@ Requires:       python3-libmodulemd
 Requires:       python3-libmodulemd1
 %endif
 Requires:       python3-gobject
-Requires:       python3-pdc-client
 Requires:       python3-createrepo_c
 Requires:       python3-PyYAML
-Requires:       python3-dogpile-cache
 
 Requires:       python3-%{name} = %{version}-%{release}
 
@@ -202,6 +197,9 @@ nosetests-3 --exe
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
 
 %changelog
+* Mon Jan 14 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-4
+- Use python deps generator correctly
+
 * Thu Jan 10 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-3
 - Replace basearch in ostree ref in message