Compare commits

..

5 Commits

Author SHA1 Message Date
Neal Gompa e47f8797e3 Actually add the patch 2018-09-16 07:04:12 -04:00
Neal Gompa f43651e736 Fix regex related deprecation warnings (rhbz#1598089) 2018-09-16 07:03:23 -04:00
Fedora Release Engineering 3db610549f - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 03:44:04 +00:00
Fedora Release Engineering d65daa3d50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 13:19:09 +00:00
Fedora Release Engineering 154304be4d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 13:16:48 +00:00
2 changed files with 61 additions and 2 deletions
@@ -0,0 +1,44 @@
From 693c9549280b78860b756b593b5922bf3be46888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 15 Feb 2017 11:19:29 +0200
Subject: [PATCH] bumpspec, checksig: Avoid python 3.6 regex related
deprecations
---
rpmdev-bumpspec | 6 ++++--
rpmdev-checksig | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec
index ea2ddd9..35e6c9c 100755
--- a/rpmdev-bumpspec
+++ b/rpmdev-bumpspec
@@ -44,8 +44,10 @@ class SpecFile(object):
# supported release value macro definitions
_macro_bump_patterns = (
- re.compile(r"^%(?:define|global)\s+(?i)release\s+(\d+.*)"),
- re.compile(r"^%(?:define|global)\s+(?i)baserelease\s+(\d+.*)"),
+ re.compile(r"^%(?:define|global)\s+"
+ r"[Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"),
+ re.compile(r"^%(?:define|global)\s+"
+ r"[Bb][Aa][Ss][Ee][Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"),
)
# normal "Release:" tag lines
_tag_bump_patterns = (
diff --git a/rpmdev-checksig b/rpmdev-checksig
index 0e90fe5..76b5967 100755
--- a/rpmdev-checksig
+++ b/rpmdev-checksig
@@ -44,7 +44,7 @@ def lookupKeyID(ts, keyid):
mi.pattern('version', rpm.RPMMIRE_STRCMP, keyid)
for hdr in mi:
sum = hdr['summary']
- mo = re.search(b'\<.*\>', sum)
+ mo = re.search(rb'\<.*\>', sum)
email = mo.group().decode(errors='replace')
return email
--
2.17.1
+17 -2
View File
@@ -8,7 +8,7 @@
Name: rpmdevtools
Version: 8.10
Release: 2%{?dist}
Release: 6%{?dist}
Summary: RPM Development Tools
# rpmdev-setuptree is GPLv2, everything else GPLv2+
@@ -16,6 +16,9 @@ License: GPLv2+ and GPLv2
URL: https://pagure.io/rpmdevtools
Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
# Backports from upstream
Patch0001: 0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch
BuildArch: noarch
# help2man, pod2man, *python for creating man pages
BuildRequires: help2man
@@ -75,7 +78,7 @@ rpmdev-bumpspec Bump revision in specfile
%prep
%setup -q
%autosetup -p1
%if %{with python3}
grep -lF "%{_bindir}/python " * \
| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
@@ -123,6 +126,18 @@ done
%changelog
* Sun Sep 16 2018 Neal Gompa <ngompa13@gmail.com> - 8.10-6
- Fix regex related deprecation warnings (rhbz#1598089)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild