[rpms/fedpkg] 1.48-1: Patch: Add support for epel*-next branches

[rpms/fedpkg] 1.48-1: Patch: Add support for epel*-next branches

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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : ee2d8465803e11c236ae764d445b99593d835353
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2021-04-03T17:27:50+00:00
            Stats  : +80/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/ee2d8465803e11c236ae764d445b99593d835353?branch=1.48-1

            Log:
            Patch: Add support for epel*-next branches

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

---
diff --git a/0008-Add-support-for-epel-next-branches.patch b/0008-Add-support-for-epel-next-branches.patch
new file mode 100644
index 0000000..1a1b5a3
--- /dev/null
+++ b/0008-Add-support-for-epel-next-branches.patch
@@ -0,0 +1,75 @@
+From 70c316b18dffc62a20fc2cf847b6c378bfb57c9e Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Fri, 12 Feb 2021 15:56:37 -0600
+Subject: [PATCH] Add support for epel*-next branches
+
+Signed-off-by: Carl George <carl@george.computer>
+---
+ fedpkg/__init__.py | 7 +++++++
+ fedpkg/cli.py      | 7 ++++++-
+ fedpkg/utils.py    | 4 ++++
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index 155b6d7..79170b2 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -150,6 +150,13 @@ class Commands(pyrpkg.Commands):
+             self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
+             self.override = 'epel%s-override' % self._distval
+             self._distunset = 'fedora'
++        elif re.match(r'epel\d+-next$', self.branch_merge):
++            self._distval = re.search(r'\d+', self.branch_merge).group(0)
++            self._distvar = 'rhel'
++            self._disttag = 'el%s.next' % self._distval
++            self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
++            self.override = 'epel%s-override' % self._distval
++            self._distunset = 'fedora'
+         elif re.match(r'olpc\d$', self.branch_merge):
+             self._distval = self.branch_merge.split('olpc')[1]
+             self._distvar = 'olpc'
+diff --git a/fedpkg/cli.py b/fedpkg/cli.py
+index 406151f..e0fe504 100644
+--- a/fedpkg/cli.py
++++ b/fedpkg/cli.py
+@@ -1033,8 +1033,12 @@ class fedpkgClient(cliClient):
+                 *list(get_release_branches(pdc_url).values())))
+             # treat epel*-playground the same as epel* release branches
+             playground_match = re.match(r'^(epel\d+)-playground$', branch)
++            # treat epel*-next the same as epel* release branches
++            next_match = re.match(r'^(epel\d+)-next$', branch)
+             if playground_match:
+                 _branch = playground_match.groups()[0]
++            elif next_match:
++                _branch = next_match.groups()[0]
+             else:
+                 _branch = branch
+             if _branch in release_branches:
+@@ -1090,7 +1094,8 @@ class fedpkgClient(cliClient):
+             auto_module = (
+                 ns == 'rpms'
+                 and not re.match(RELEASE_BRANCH_REGEX, b)
+-                and not playground_match  # Dont run auto_module on epel requests
++                and not playground_match  # Dont run auto_module on epel-playground requests
++                and not next_match        # Dont run auto_module on epel-next requests
+                 and not no_auto_module
+             )
+             if auto_module:
+diff --git a/fedpkg/utils.py b/fedpkg/utils.py
+index 046ead3..b7d883f 100644
+--- a/fedpkg/utils.py
++++ b/fedpkg/utils.py
+@@ -450,6 +450,10 @@ def get_stream_branches(server_url, package_name):
+         # target to build.
+         elif re.match(r'^epel\d+-playground$', item['name']):
+             continue
++        # epel8-next and above branches should be considered as release branches
++        # so that it will use epelX-next-candidate target to build.
++        elif re.match(r'^epel\d+-next$', item['name']):
++            continue
+         else:
+             stream_branches.append(item)
+     return stream_branches
+-- 
+2.30.2
+

diff --git a/fedpkg.spec b/fedpkg.spec
index d16bdf8..c6ab3ab 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.40
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -20,6 +20,7 @@ Patch4:         0004-New-default-dist-git-branch-rawhide-unittests.patch
 Patch5:         0005-Clone-rawhide-branch-with-clone-B.patch
 Patch6:         0006-Default-branches-on-different-namespaces.patch
 Patch7:         0007-Unittests-for-new-default-branches.patch
+Patch8:         0008-Add-support-for-epel-next-branches.patch
 
 # RHEL7 is currently the only release that is built for Python 2.
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -149,6 +150,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Sat Apr 03 2021 Ondřej Nosek <onosek@redhat.com> - 1.40-6
+- Patch: Add support for epel*-next branches
+
 * Mon Mar 01 2021 Ondřej Nosek <onosek@redhat.com> - 1.40-5
 - Patch: Default branches on different namespaces