[rpms/fedpkg] 1.48-1: Patch: Removes check of bodhi-client version

[rpms/fedpkg] 1.48-1: Patch: Removes check of bodhi-client version

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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : ba368158b70190fdb6e06c055a6331abe5579f07
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2020-02-03T15:46:45+00:00
            Stats  : +47/-5 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/ba368158b70190fdb6e06c055a6331abe5579f07?branch=1.48-1

            Log:
            Patch: Removes check of bodhi-client version

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

---
diff --git a/0007-Removes-check-of-bodhi-client-version.patch b/0007-Removes-check-of-bodhi-client-version.patch
new file mode 100644
index 0000000..a2c56f8
--- /dev/null
+++ b/0007-Removes-check-of-bodhi-client-version.patch
@@ -0,0 +1,38 @@
+From 183f6f30ac7a8183dd253b0d6a5145b6ad4ebade Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Mon, 3 Feb 2020 16:16:43 +0100
+Subject: [PATCH] Removes check of bodhi-client version
+
+Modification of this part of the code is not needed now when a new
+major version of Bodhi is released (if there are not incompatibilities
+with previous Bodhi version).
+
+Fixes: rhbz#1796972
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ fedpkg/cli.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/fedpkg/cli.py b/fedpkg/cli.py
+index ebf3a88..e2291ff 100644
+--- a/fedpkg/cli.py
++++ b/fedpkg/cli.py
+@@ -87,13 +87,9 @@ require_testcases=%(require_testcases)s
+ 
+ def check_bodhi_version():
+     try:
+-        dist = pkg_resources.get_distribution('bodhi_client')
++        pkg_resources.get_distribution('bodhi_client')
+     except pkg_resources.DistributionNotFound:
+         raise rpkgError('bodhi-client < 2.0 is not supported.')
+-    major = int(dist.version.split('.', 1)[0])
+-    if major >= 5:
+-        raise rpkgError(
+-            'This system has bodhi v{0}, which is unsupported.'.format(major))
+ 
+ 
+ class fedpkgClient(cliClient):
+-- 
+2.21.1
+

diff --git a/fedpkg.spec b/fedpkg.spec
index a41cd87..33c6c55 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.37
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -19,6 +19,7 @@ Patch2:         0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
 Patch3:         0004-Add-epel-playground-into-rpmdefines.patch
 Patch4:         0005-Use-package.cfg-for-epel8-branches.patch
 Patch5:         0006-display_name-added-to-bodhi.template.patch
+Patch6:         0007-Removes-check-of-bodhi-client-version.patch
 
 # fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
 %if 0%{?fedora} > 28 || 0%{?rhel} > 7
@@ -41,7 +42,7 @@ Requires:       redhat-rpm-config
 
 BuildRequires:  python2-devel
 # We br these things for man page generation due to imports
-BuildRequires:  python2-rpkg >= 1.58-8
+BuildRequires:  python2-rpkg >= 1.59-4
 BuildRequires:  python2-distro
 # This until fedora-cert gets fixed
 BuildRequires:  python2-fedora
@@ -74,7 +75,7 @@ BuildRequires:  python2-bugzilla
 Requires:       python2-bugzilla
 %endif
 
-Requires:       python2-rpkg >= 1.58-8
+Requires:       python2-rpkg >= 1.59-4
 Requires:       python2-distro
 Requires:       python2-fedora
 Requires:       python2-openidc-client >= 0.6.0
@@ -85,7 +86,7 @@ Requires:       python2-openidc-client >= 0.6.0
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.58-8
+BuildRequires:  python3-rpkg >= 1.59-4
 BuildRequires:  python3-distro
 # This until fedora-cert gets fixed
 BuildRequires:  python3-fedora
@@ -99,7 +100,7 @@ BuildRequires:  python3-bodhi-client
 
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.58-8
+Requires:       python3-rpkg >= 1.59-4
 Requires:       python3-distro
 Requires:       python3-fedora
 Requires:       python3-openidc-client >= 0.6.0
@@ -169,6 +170,9 @@ nosetests
 
 
 %changelog
+* Mon Feb 03 2020 Ondřej Nosek <onosek@redhat.com> - 1.37-13
+- Patch: Removes check of bodhi-client version
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild