!6 [sync] PR-5: fix command error

From: @openeuler-sync-bot 
Reviewed-by: @overweight 
Signed-off-by: @overweight

0002-BZ-1851499-port-to-str-return-values.patch

@@ -0,0 +1,28 @@
+diff -up rpmdevtools-8.10/rpmdev-checksig.orig rpmdevtools-8.10/rpmdev-checksig
+--- rpmdevtools-8.10/rpmdev-checksig.orig	2020-06-29 10:29:43.936758775 +0200
++++ rpmdevtools-8.10/rpmdev-checksig	2020-06-29 10:29:55.540983848 +0200
+@@ -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(rb'\<.*\>', sum)
+-        email = mo.group().decode(errors='replace')
++        mo = re.search('\<.*\>', sum)
++        email = mo.group()
+         return email
+ 
+ 
+diff -up rpmdevtools-8.10/rpmdev-rmdevelrpms.py.orig rpmdevtools-8.10/rpmdev-rmdevelrpms.py
+--- rpmdevtools-8.10/rpmdev-rmdevelrpms.py.orig	2020-06-29 10:28:59.503896990 +0200
++++ rpmdevtools-8.10/rpmdev-rmdevelrpms.py	2020-06-29 10:29:09.897098576 +0200
+@@ -42,8 +42,8 @@ dev_re = re.compile("-(?:de(?:buginfo|ve
+ test_re = re.compile("^perl-(?:Devel|ExtUtils|Test)-")
+ lib_re1 = re.compile("^lib.+")
+ lib_re2 = re.compile("-libs?$")
+-a_re = re.compile(b"\\w\\.a$")
+-so_re = re.compile(b"\\w\\.so(?:\\.\\d+)*$")
++a_re = re.compile("\\w\\.a$")
++so_re = re.compile("\\w\\.so(?:\\.\\d+)*$")
+ comp_re = re.compile("^compat-gcc")
+ # required by Ant, which is required by Eclipse...
+ jdev_re = re.compile("^java-.+-gcj-compat-devel$")

0003-fix-return-value-error-for-rpminfo.pacth

@@ -0,0 +1,20 @@
+diff -Nur a/rpminfo b/rpminfo
+--- a/rpminfo	2017-01-14 18:51:20.000000000 +0800
++++ b/rpminfo	2022-03-21 18:05:43.006853690 +0800
+@@ -357,7 +357,7 @@
+ fi
+ temp_prefix="$temp_prefix/"
+ 
+-trap "chmod -R u+rwx $temp_prefix 2>/dev/null; rm -rf $temp_prefix; exit -1" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
++trap "chmod -R u+rwx $temp_prefix 2>/dev/null; rm -rf $temp_prefix; exit -1" 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30
+ 
+ pkg_num=0
+ for pkg in $packages; do
+@@ -385,5 +385,7 @@
+         check_package "$i"
+     done
+ fi
++chmod -R u+rwx $temp_prefix 2>/dev/null
++rm -rf $temp_prefix
+ 
+ exit 0

rpmdevtools.spec

@@ -3,7 +3,7 @@
 
 Name:           rpmdevtools
 Version:        8.10
-Release:        8
+Release:        9
 Summary:        RPM Development Tools
 
 License:        GPLv2+ and GPLv2
@@ -11,6 +11,9 @@ URL:            https://pagure.io/rpmdevtools
 Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 
 Patch0001:      0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch
+#https://pagure.io/fork/mdomonko/rpmdevtools/c/1d092174e75c63de020ecd48cee449d59de2141e
+Patch0002:      0002-BZ-1851499-port-to-str-return-values.patch
+Patch0003:      0003-fix-return-value-error-for-rpminfo.pacth
 
 BuildArch:      noarch
 %if %{with python3}
@@ -71,6 +74,10 @@ done
 %{_mandir}/man[18]/*.[18]*
 
 %changelog
+* Mon Mar 21 2022 liyanan  <liyanan32@huawei.com> - 8.10-9
+- BZ 1851499 port to str return values
+- fix return value error for rpminfo
+
 * Fri Feb 21 2020 openEuler Buildtam <buildteam@openeuler.org> - 8.10-8
 - disable python2