You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1.3 KiB
29 lines
1.3 KiB
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(b'\<.*\>', 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$")
|