[rpms/fedpkg] 1.48-1: Backporting bump check for bodhi client

[rpms/fedpkg] 1.48-1: Backporting bump check for bodhi client

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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : cb939a565604d2efa6e2432facc0f7dc595f8273
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2019-05-31T11:48:31+00:00
            Stats  : +38/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/cb939a565604d2efa6e2432facc0f7dc595f8273?branch=1.48-1

            Log:
            Backporting bump check for bodhi client

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

---
diff --git a/0001-Bump-check-for-bodhi-client.patch b/0001-Bump-check-for-bodhi-client.patch
new file mode 100644
index 0000000..9a77448
--- /dev/null
+++ b/0001-Bump-check-for-bodhi-client.patch
@@ -0,0 +1,32 @@
+From b78a5ee21f5bd9d07aa2ace7177ac0f49ee11c06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Fri, 31 May 2019 09:36:10 +0200
+Subject: [PATCH] Bump check for bodhi client
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There should be no change on the client for what fedpkg is using.
+
+Fixes: https://pagure.io/fedpkg/issue/330
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ fedpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fedpkg/cli.py b/fedpkg/cli.py
+index e8ebe4a..d7b0872 100644
+--- a/fedpkg/cli.py
++++ b/fedpkg/cli.py
+@@ -84,7 +84,7 @@ def check_bodhi_version():
+     except pkg_resources.DistributionNotFound:
+         raise rpkgError('bodhi-client < 2.0 is not supported.')
+     major = int(dist.version.split('.', 1)[0])
+-    if major >= 4:
++    if major >= 5:
+         raise rpkgError(
+             'This system has bodhi v{0}, which is unsupported.'.format(major))
+ 
+-- 
+2.20.1
+

diff --git a/fedpkg.spec b/fedpkg.spec
index c30ff9f..b8c2ac5 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -13,6 +13,7 @@ URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
+Patch0:         0001-Bump-check-for-bodhi-client.patch
 
 # fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
 %if 0%{?fedora} > 28 || 0%{?rhel} > 7
@@ -113,7 +114,7 @@ Requires:       %{name} = %{version}-%{release}
 Provides the fedpkg command for working with dist-git
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %py_build
@@ -163,6 +164,9 @@ nosetests
 
 
 %changelog
+* Fri May 31 2019 Ondřej Nosek <onosek@redhat.com> - 1.37-2
+- Backport: Bump check for bodhi client (version 4)
+
 * Mon Apr 29 2019 Ondrej Nosek <onosek@redhat.com> - 1.37-1
 - Ignore files in a cloned repository - patterns (onosek)
 - Create env without --system-site-packages enabled to run flake8 (cqi)