[rpms/rpkg] 1.70-1: Patch and python-requests-kerberos dependency

[rpms/rpkg] 1.70-1: Patch and python-requests-kerberos dependency

[@ 2026-08-10 21:44 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 361beeb7cd0beecbfc3e9a41c52a7dfc39cca371
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2021-09-14T09:53:41+00:00
            Stats  : +43/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/361beeb7cd0beecbfc3e9a41c52a7dfc39cca371?branch=1.70-1

            Log:
            Patch and python-requests-kerberos dependency

Patch: Print SpecFile parsing debug info
Add python-requests-kerberos as a new dependency for RHEL packages

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0004-Print-SpecFile-parsing-debug-info.patch b/0004-Print-SpecFile-parsing-debug-info.patch
new file mode 100644
index 0000000..2a8d22a
--- /dev/null
+++ b/0004-Print-SpecFile-parsing-debug-info.patch
@@ -0,0 +1,32 @@
+From 166aaedb9fc92590f5e9364c1cb6f607eaf28876 Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Mon, 6 Sep 2021 18:18:17 +0200
+Subject: [PATCH 1/3] Print SpecFile parsing debug info
+
+The recently added class SpecFile parses a specfile with tool rpmspec.
+It provides error messages when parsing failed. This change will show
+these messages to user. Without this rhpkg only fails with exception
+and simple message.
+
+Resolves: rhbz#2000556
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ pyrpkg/spec.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyrpkg/spec.py b/pyrpkg/spec.py
+index 6341fcd..a276120 100644
+--- a/pyrpkg/spec.py
++++ b/pyrpkg/spec.py
+@@ -49,6 +49,7 @@ def run(spec, sourcedir):
+ 
+     retcode = process.poll()
+     if retcode:
++        print(stderr.decode('utf-8'))
+         raise rpkgError('Error running rpmspec on "%s", return code %s'
+                         % (spec, retcode))
+ 
+-- 
+2.31.1
+

diff --git a/rpkg.spec b/rpkg.spec
index 40dc68d..f91a0c6 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.63
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -19,7 +19,8 @@ Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
 Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
 Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
 Patch2:         0002-Use-six-library-in-tests.patch
-Patch3:	        0003-Pass-sourcedir-to-rpmspec-when-specfile-is-parsed.patch
+Patch3:         0003-Pass-sourcedir-to-rpmspec-when-specfile-is-parsed.patch
+Patch4:         0004-Print-SpecFile-parsing-debug-info.patch
 
 # RHEL7 is currently the only release that is built for Python 2.
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -54,6 +55,7 @@ BuildRequires:  PyYAML
 BuildRequires:  GitPython
 BuildRequires:  python-pycurl
 BuildRequires:  python-requests
+BuildRequires:  python-requests-kerberos
 BuildRequires:  python-six >= 1.9.0
 BuildRequires:  python2-mock
 BuildRequires:  python2-nose
@@ -69,6 +71,7 @@ Requires:       PyYAML
 Requires:       GitPython >= 0.2.0
 Requires:       python-pycurl
 Requires:       python-requests
+Requires:       python-requests-kerberos
 Requires:       python-six >= 1.9.0
 Requires:       rpm-python
 
@@ -103,6 +106,7 @@ BuildRequires:  python3-koji >= 1.24
 %if 0%{?rhel}
 BuildRequires:  python3-gobject-base
 BuildRequires:  libmodulemd
+BuildRequires:  python3-requests-kerberos
 %else
 BuildRequires:  python3-libmodulemd
 %endif
@@ -128,6 +132,7 @@ Requires:       python3-koji >= 1.24
 %if 0%{?rhel}
 Requires:       python3-gobject-base
 Requires:       libmodulemd
+Requires:       python3-requests-kerberos
 %else
 Requires:       python3-libmodulemd
 Requires:       python3-rpmautospec
@@ -239,6 +244,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 
 
 %changelog
+* Mon Sep 13 2021 Ondřej Nosek <onosek@redhat.com> - 1.63-3
+- Add python-requests-kerberos as a new dependency for RHEL packages
+- Patch: Print SpecFile parsing debug info
+
 * Wed Sep 01 2021 Ondřej Nosek <onosek@redhat.com> - 1.63-2
 - Patch: Pass sourcedir to rpmspec when specfile is parsed