From fa6dbf8aa58d18f86c59a49afdc696bd40769e5b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:20:25 +0000
Subject: import yum-rhn-plugin-2.0.1-6.el7


---

diff --git a/SOURCES/yum-rhn-plugin-2.0.1-5-el7-to-yum-rhn-plugin-2.0.1-6-el7.patch b/SOURCES/yum-rhn-plugin-2.0.1-5-el7-to-yum-rhn-plugin-2.0.1-6-el7.patch
new file mode 100644
index 0000000..10ddee3
--- /dev/null
+++ b/SOURCES/yum-rhn-plugin-2.0.1-5-el7-to-yum-rhn-plugin-2.0.1-6-el7.patch
@@ -0,0 +1,36 @@
+diff --git a/rhnplugin.py b/rhnplugin.py
+index 88fb354..a2681c2 100644
+--- a/rhnplugin.py
++++ b/rhnplugin.py
+@@ -384,7 +384,7 @@ class RhnRepo(YumRepository):
+     # Override the 'private' __get method so we can do our auth stuff.
+     def _getFile(self, url=None, relative=None, local=None,
+         start=None, end=None, copy_local=0, checkfunc=None, text=None,
+-        reget='simple', cache=True, size=None):
++        reget='simple', cache=True, size=None, **kwargs):
+         try:
+             try:
+                 return self._noExceptionWrappingGet(url, relative, local,
+diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
+index 006b9b1..1ced7dc 100644
+--- a/yum-rhn-plugin.spec
++++ b/yum-rhn-plugin.spec
+@@ -1,7 +1,7 @@
+ Summary: Spacewalk support for yum
+ Name: yum-rhn-plugin
+ Version: 2.0.1
+-Release: 5%{?dist}
++Release: 6%{?dist}
+ License: GPLv2
+ Group: System Environment/Base
+ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+@@ -70,6 +70,9 @@ fi
+ %doc LICENSE
+ 
+ %changelog
++* Mon Jul 25 2016 Tomas Kasparek <tkasparek@redhat.com> 2.0.1-6
++- Resolves: #1359087 - expect additional arguments (tkasparek@redhat.com)
++
+ * Wed Sep 17 2014 Stephen Herr <sherr@redhat.com> 2.0.1-5
+ - Related: #1115516 - don't encode proxy url if not set (mzazrivec@redhat.com)
+ - Related: #1115516 - encode proxy url when passing it to urlgrabber
diff --git a/SPECS/yum-rhn-plugin.spec b/SPECS/yum-rhn-plugin.spec
index 4f89955..8e82bef 100644
--- a/SPECS/yum-rhn-plugin.spec
+++ b/SPECS/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
 Summary: Spacewalk support for yum
 Name: yum-rhn-plugin
 Version: 2.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@ Patch0: yum-rhn-plugin-2.0.1-1-to-yum-rhn-plugin-2.0.1-2-el7.patch
 Patch1: yum-rhn-plugin-2.0.1-2-el7-to-yum-rhn-plugin-2.0.1-3-el7.patch
 Patch2: yum-rhn-plugin-2.0.1-3-el7-to-yum-rhn-plugin-2.0.1-4-el7.patch
 Patch3: yum-rhn-plugin-2.0.1-4-el7-to-yum-rhn-plugin-2.0.1-5-el7.patch
+Patch4: yum-rhn-plugin-2.0.1-5-el7-to-yum-rhn-plugin-2.0.1-6-el7.patch
 URL:     https://fedorahosted.org/spacewalk
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
@@ -38,6 +39,7 @@ software updates.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make -f Makefile.yum-rhn-plugin
@@ -78,6 +80,9 @@ fi
 %doc LICENSE
 
 %changelog
+* Mon Jul 25 2016 Tomas Kasparek <tkasparek@redhat.com> 2.0.1-6
+- Resolves: #1359087 - expect additional arguments (tkasparek@redhat.com)
+
 * Wed Sep 17 2014 Stephen Herr <sherr@redhat.com> 2.0.1-5
 - Related: #1115516 - don't encode proxy url if not set (mzazrivec@redhat.com)
 - Related: #1115516 - encode proxy url when passing it to urlgrabber