[rpms/fedpkg] 1.48-1: Backporting epel8 related changes

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 9cb26eba36a854290012100014c7516fb4b89cce
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2019-08-02T10:47:41+00:00
            Stats  : +147/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/9cb26eba36a854290012100014c7516fb4b89cce?branch=1.48-1

            Log:
            Backporting epel8 related changes

Add epel*-playground into rpmdefines
Backport: Use package.cfg for epel8+ branches

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

---
diff --git a/0004-Add-epel-playground-into-rpmdefines.patch b/0004-Add-epel-playground-into-rpmdefines.patch
new file mode 100644
index 0000000..f848967
--- /dev/null
+++ b/0004-Add-epel-playground-into-rpmdefines.patch
@@ -0,0 +1,59 @@
+From 27366b3e35008d0ffef6986555693b1874586795 Mon Sep 17 00:00:00 2001
+From: Stephen Smoogen <smooge@gmail.com>
+Date: Mon, 22 Jul 2019 13:04:30 -0400
+Subject: [PATCH] Add epel*-playground into rpmdefines
+
+Signed-off-by: Stephen Smoogen <smooge@gmail.com>
+Merges: https://pagure.io/fedpkg/pull-request/343
+---
+ fedpkg/__init__.py    |  7 +++++++
+ test/test_commands.py | 15 +++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index f66cb12..fd050e6 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -141,6 +141,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+-playground$', self.branch_merge):
++            self._distval = re.search(r'\d+', self.branch_merge).group(0)
++            self._distvar = 'rhel'
++            self._disttag = 'el%s_playground' % 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/test/test_commands.py b/test/test_commands.py
+index 7824f9f..ebf4a3f 100644
+--- a/test/test_commands.py
++++ b/test/test_commands.py
+@@ -245,6 +245,21 @@ class TestLoadRpmDefines(CommandTestCase):
+ 
+         self.assert_rpmdefines()
+ 
++    @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
++    def test_load_epel8_playground_dist_tag(self, branch_merge):
++        branch_merge.return_value = 'epel8-playground'
++
++        self.cmd.load_rpmdefines()
++
++        self.assertEqual('8', self.cmd._distval)
++        self.assertEqual('rhel', self.cmd._distvar)
++        self.assertEqual('el8_playground', self.cmd._disttag)
++        self.assertEqual('epel-8-i686', self.cmd.mockconfig)
++        self.assertEqual('epel8-override', self.cmd.override)
++        self.assertTrue(hasattr(self.cmd, '_distunset'))
++
++        self.assert_rpmdefines()
++
+     @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
+     @patch('fedpkg.Commands._findmasterbranch')
+     def test_load_master_dist_tag(self, _findmasterbranch, branch_merge):
+-- 
+2.21.0
+

diff --git a/0005-Use-package.cfg-for-epel8-branches.patch b/0005-Use-package.cfg-for-epel8-branches.patch
new file mode 100644
index 0000000..59f2228
--- /dev/null
+++ b/0005-Use-package.cfg-for-epel8-branches.patch
@@ -0,0 +1,81 @@
+From 702d68544d20e9cc3f2eb820dacb12f5fd76e8b0 Mon Sep 17 00:00:00 2001
+From: Mohan Boddu <mboddu@bhujji.com>
+Date: Fri, 26 Jul 2019 11:40:00 -0400
+Subject: [PATCH] Use package.cfg for epel8+ branches
+
+Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
+Merges: https://pagure.io/fedpkg/pull-request/348
+---
+ fedpkg/utils.py    | 28 +++++++++++++++++++++++-----
+ test/test_utils.py |  4 +++-
+ 2 files changed, 26 insertions(+), 6 deletions(-)
+
+diff --git a/fedpkg/utils.py b/fedpkg/utils.py
+index ea25439..fcaa6ec 100644
+--- a/fedpkg/utils.py
++++ b/fedpkg/utils.py
+@@ -350,11 +350,25 @@ def get_stream_branches(server_url, package_name):
+     # Please remember to review the data regularly, there are only stream
+     # branches, or some new replacement of PDC fixes the issue as well, it
+     # should be ok to remove if from this list.
+-    return [
+-        item for item in branches
+-        if not re.match(r'^(f|el|epel)\d+$', item['name']) and
+-        item['name'] != 'master'
+-    ]
++    stream_branches = []
++    for item in branches:
++        if item['name'] == 'master':
++            continue
++        elif re.match(r'^(f|el)\d+$', item['name']):
++            continue
++        # epel7 is regular release branch
++        # epel8 and above should be considered a stream branch to use
++        # package.cfg file in the branch.
++        elif 'epel7' == item['name']:
++            continue
++        # epel8-playground and above playground branches should be considered
++        # as release branches so that it will use epelX-playground-candidate
++        # target to build.
++        elif re.match(r'^epel\d+-playground$', item['name']):
++            continue
++        else:
++            stream_branches.append(item)
++    return stream_branches
+ 
+ 
+ def expand_release(rel, active_releases):
+@@ -379,5 +393,9 @@ def expand_release(rel, active_releases):
+         return active_releases['epel']
+     elif rel in active_releases['fedora'] or rel in active_releases['epel']:
+         return [rel]
++    # if epelX-playground branch then return the release to use
++    # epelX-playground-candidate target
++    elif re.match(r'^epel\d+-playground$', rel):
++        return [rel]
+     else:
+         return None
+diff --git a/test/test_utils.py b/test/test_utils.py
+index 74db227..1ee4ce8 100644
+--- a/test/test_utils.py
++++ b/test/test_utils.py
+@@ -468,13 +468,15 @@ class TestGetStreamBranches(unittest.TestCase):
+                 {'name': 'f28'},
+                 {'name': 'epel7'},
+                 {'name': 'master'},
++                {'name': 'epel8'},
++                {'name': 'epel8-playground'}
+             ],
+             'next': None
+         }
+         get.return_value = rv
+ 
+         result = utils.get_stream_branches('http://localhost/', 'pkg')
+-        self.assertEqual([{'name': '8'}, {'name': '10'}], list(result))
++        self.assertEqual([{'name': '8'}, {'name': '10'}, {'name': 'epel8'}], list(result))
+ 
+ 
+ class TestExpandRelease(unittest.TestCase):
+-- 
+2.21.0
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 7e08ecc..34dc569 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.37
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -16,6 +16,8 @@ BuildArch:      noarch
 Patch0:         0001-Bump-check-for-bodhi-client.patch
 Patch1:         0002-Support-for-epel-playground-branch-requests.patch
 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
 
 # fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
 %if 0%{?fedora} > 28 || 0%{?rhel} > 7
@@ -166,6 +168,10 @@ nosetests
 
 
 %changelog
+* Thu Aug 01 2019 Ondřej Nosek <onosek@redhat.com> - 1.37-6
+- Backport: Add epel*-playground into rpmdefines
+- Backport: Use package.cfg for epel8+ branches
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild