[rpms/rpkg] 1.70-1: Remove koji and rpm-py-installer Python package requires

[Chenxiong Qi <cqi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 172445c0f645082470357b2b8f9e61a9cfb3c770
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-05-21T17:21:55+08:00
            Stats  : +45/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/172445c0f645082470357b2b8f9e61a9cfb3c770?branch=1.70-1

            Log:
            Remove koji and rpm-py-installer Python package requires

Fixes rhbz#1579367

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---
diff --git a/fix-argparse-version-for-el6.patch b/fix-argparse-version-for-el6.patch
new file mode 100644
index 0000000..da56b90
--- /dev/null
+++ b/fix-argparse-version-for-el6.patch
@@ -0,0 +1,11 @@
+--- rpkg-1.54/setup.py.orig	2018-05-21 17:16:33.425149133 +0800
++++ rpkg-1.54/setup.py	2018-05-21 17:16:59.240397138 +0800
+@@ -40,7 +40,7 @@
+     install_requires.remove('GitPython')
+     install_requires += [
+         'GitPython<1.0.0',
+-        'argparse==1.4.0',
++        'argparse',
+     ]
+     tests_require += [
+         'unittest2'

diff --git a/remove-koji-and-rpm-py-installer-from-requires.patch b/remove-koji-and-rpm-py-installer-from-requires.patch
new file mode 100644
index 0000000..b3254d3
--- /dev/null
+++ b/remove-koji-and-rpm-py-installer-from-requires.patch
@@ -0,0 +1,14 @@
+--- rpkg-1.54/setup.py.orig	2018-05-21 12:36:09.481898935 +0800
++++ rpkg-1.54/setup.py	2018-05-21 12:38:27.246778969 +0800
+@@ -46,6 +46,11 @@
+         'unittest2'
+     ]
+ 
++install_requires = [
++    item for item in install_requires
++    if not item.startswith('koji') and not item.startswith('rpm-py-installer')
++]
++
+ readme_rst = os.path.join(setup_py_path, 'README.rst')
+ with open(readme_rst, 'r') as readme:
+     long_description = readme.read().rstrip()

diff --git a/rpkg.spec b/rpkg.spec
index ae0a151..9705afd 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,7 +3,7 @@
 
 Name:           rpkg
 Version:        1.54
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -11,6 +11,19 @@ URL:            https://pagure.io/rpkg
 Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
+# Fix for bug 1579367
+# Due to https://pagure.io/koji/issue/912, python[23]-koji package does not
+# have egginfo.
+# rpm-py-installer is required as a proxy to install RPM python binding
+# library, so rpm is the actual requirement that must be present in the
+# requires.txt. But, rpkg has to work in all active Fedora and EPEL releases,
+# and there is only old rpm-python package in EL6 and 7, so just simply to
+# remove rpm-py-installer for now.
+Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
+
+# In EPEL6, there is only older version rather than 1.4.0
+Patch1:         fix-argparse-version-for-el6.patch
+
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Enable python3 build by default
@@ -162,6 +175,8 @@ Common files for python2-%{name} and python3-%{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -240,6 +255,10 @@ nosetests tests
 
 
 %changelog
+* Mon May 21 2018 Chenxiong Qi <cqi@redhat.com> - 1.54-2
+- Remove koji and rpm-py-installer Python package requires
+- Fix argparse version for el6
+
 * Fri May 11 2018 Chenxiong Qi <cqi@redhat.com> - 1.54-1
 - Pass the -s/--set-default-stream to mbs-manager for module local builds.
   (jkaluza)