commit 5d0f0f2ffe722972678078b592fb0a3e81f4779e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 12 21:50:00 2016 +0000
Fix realms error
fix_realms_error.patch | 27 +++++++++++++++++++++++++++
rfpkg.spec | 7 ++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/fix_realms_error.patch b/fix_realms_error.patch
new file mode 100644
index 0000000..7166811
--- /dev/null
+++ b/fix_realms_error.patch
@@ -0,0 +1,27 @@
+From c2f3b36a8842716269075a03c658d4f8e36aaa55 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux(a)fedoraproject.org>
+Date: Mon, 12 Dec 2016 21:22:12 +0000
+Subject: [PATCH] Update for pyrpkg changes
+
+This change broke rfpkg
+
+"Swtich to using CCColUtils to determine username from krb realms"
+
+https://pagure.io/rpkg/c/14e35c4f4144495a2767a84fd4934fd5c2c9d8ce?branch=master
+---
+ src/rfpkg/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rfpkg/__init__.py b/src/rfpkg/__init__.py
+index 8860174..b988f7d 100644
+--- a/src/rfpkg/__init__.py
++++ b/src/rfpkg/__init__.py
+@@ -30,7 +30,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):
++ quiet=False, distgit_namespaced=False, realms=None):
+ """Init the object and some configuration
details."""
+
+ # We are subclassing to set kojiconfig to none, so that we can
diff --git a/rfpkg.spec b/rfpkg.spec
index aa8be0a..d65d661 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -9,11 +9,12 @@
Name: rfpkg
Summary: RPM Fusion utility for working with dist-git
Version: 1.25.1
-Release: 1%{?dist}
+Release: 2%{?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
Requires: pyrpkg >= 1.45, redhat-rpm-config
Requires: python-pycurl, koji, python-fedora
@@ -42,6 +43,7 @@ RPM Fusion utility for working with dist-git.
%prep
%setup -q
+%patch0 -p1
%build
%{__python2} setup.py build
@@ -78,6 +80,9 @@ mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%changelog
+* Mon Dec 12 2016 leigh scott <leigh123linux(a)googlemail.com> - 1.25.1-2
+- Fix realms error
+
* Wed Sep 14 2016 Sérgio Basto <sergio(a)serjux.com> - 1.25.1-1
- Update to 1.25.1, force use rpmfusion-packager >= 0.5.2
- Fix rfpkg srpm in git master.