[rfpkg] Fix python-rpkg issue (rfbz #4638)
commit 7bd5b1edd587e6f90a64a0719b7525b013fc5384
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 25 10:53:05 2017 +0100
Fix python-rpkg issue (rfbz #4638)
pass_all_kwargs_parent.patch | 37 +++++++++++++++++++++++++++++++++++++
rfpkg.spec | 9 +++++++--
2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/pass_all_kwargs_parent.patch b/pass_all_kwargs_parent.patch
new file mode 100644
index 0000000..06e2193
--- /dev/null
+++ b/pass_all_kwargs_parent.patch
@@ -0,0 +1,37 @@
+From ef4d4ce9844d8cb3dba764646e2e9908e91230c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 15 May 2017 09:54:36 +0200
+Subject: [PATCH] Commands: pass all kwargs to parent
+
+When rpkg adds a new argument to the constructor, this method needs to
+be updated. But it can simply just pass all the kwargs without looking
+at them.
+---
+ src/rfpkg/__init__.py | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/rfpkg/__init__.py b/src/rfpkg/__init__.py
+index b988f7d..7e62200 100644
+--- a/src/rfpkg/__init__.py
++++ b/src/rfpkg/__init__.py
+@@ -29,8 +29,7 @@ class Commands(pyrpkg.Commands):
+
+ def __init__(self, path, lookaside, lookasidehash, lookaside_cgi,
+ gitbaseurl, anongiturl, branchre, kojiconfig,
+- build_client, user=None, dist=None, target=None,
+- quiet=False, distgit_namespaced=False, realms=None):
++ build_client, **kwargs):
+ """Init the object and some configuration
details."""
+
+ # We are subclassing to set kojiconfig to none, so that we can
+@@ -38,9 +37,7 @@ def __init__(self, path, lookaside, lookasidehash, lookaside_cgi,
+ super(Commands, self).__init__(path, lookaside, lookasidehash,
+ lookaside_cgi, gitbaseurl, anongiturl,
+ branchre, kojiconfig, build_client,
+- user=user, dist=dist, target=target,
+- quiet=quiet,
+- distgit_namespaced=distgit_namespaced)
++ **kwargs)
+
+ # New data
+ self.secondary_arch = {
diff --git a/rfpkg.spec b/rfpkg.spec
index d65d661..48a888f 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -9,12 +9,13 @@
Name: rfpkg
Summary: RPM Fusion utility for working with dist-git
Version: 1.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0:
https://github.com/rpmfusion-infra/rfpkg/archive/v%{version}.tar.gz#/%{na...
-Patch0: fix_realms_error.patch
+Patch0:
%url/commit/809dd108705224045bd41bd52c79b1daf58929d6.patch#/fix_realms_error.patch
+Patch1:
%url/pull/4/commits/ef4d4ce9844d8cb3dba764646e2e9908e91230c3.patch#/pass_all_kwargs_parent.patch
Requires: pyrpkg >= 1.45, redhat-rpm-config
Requires: python-pycurl, koji, python-fedora
@@ -44,6 +45,7 @@ RPM Fusion utility for working with dist-git.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__python2} setup.py build
@@ -80,6 +82,9 @@ mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%changelog
+* Fri Aug 25 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.1-3
+- Fix python-rpkg issue (rfbz #4638)
+
* Mon Dec 12 2016 leigh scott <leigh123linux(a)googlemail.com> - 1.25.1-2
- Fix realms error