From 1d092174e75c63de020ecd48cee449d59de2141e Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Jun 28 2020 17:28:42 +0000
Subject: Port to <str> return values from RPM. BZ 1851499


These regexes are matched against the data returned from the RPM header
functions further down the code, however the format of the data has
recently changed from <bytes> objects to decoded <str> objects, so we
should no longer declare the regexes as bytes.

Basically an inverse of the following two commits:
32581a87e3b00396c7dc2c8b6d1779ffe873abfb
d93953b644dfe26f923d8d95d1a0ab6a433ae0f1

Details on the RPM change:
https://github.com/rpm-software-management/rpm/commit/84920f898315d09a57a3f1067433eaeb7de5e830

---

diff --git a/rpmdev-checksig b/rpmdev-checksig
index 82f0366..af757b7 100755
--- a/rpmdev-checksig
+++ b/rpmdev-checksig
@@ -44,8 +44,8 @@ def lookupKeyID(ts, keyid):
     mi.pattern('version', rpm.RPMMIRE_STRCMP, keyid)
     for hdr in mi:
         sum = hdr['summary']
-        mo = re.search(br'\<.*\>', sum)
-        email = mo.group().decode(errors='replace')
+        mo = re.search(r'\<.*\>', sum)
+        email = mo.group()
         return email
 
 
diff --git a/rpmdev-rmdevelrpms.py b/rpmdev-rmdevelrpms.py
index 4a743d3..18c1345 100755
--- a/rpmdev-rmdevelrpms.py
+++ b/rpmdev-rmdevelrpms.py
@@ -42,8 +42,8 @@ dev_re = re.compile(r"-(?:de(?:buginfo|vel)|sdk|static)\b", re.IGNORECASE)
 test_re = re.compile(r"^perl-(?:Devel|ExtUtils|Test)-")
 lib_re1 = re.compile(r"^lib.+")
 lib_re2 = re.compile(r"-libs?$")
-a_re = re.compile(br"\w\.a$")
-so_re = re.compile(br"\w\.so(?:\.\d+)*$")
+a_re = re.compile(r"\w\.a$")
+so_re = re.compile(r"\w\.so(?:\.\d+)*$")
 comp_re = re.compile(r"^compat-gcc")
 # required by Ant, which is required by Eclipse...
 jdev_re = re.compile(r"^java-.+-gcj-compat-devel$")