- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch

@@ -0,0 +1,37 @@
+From ea772dae0d8bb266233c3fd9e2012281a821ef44 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 2 Nov 2018 16:20:22 -0700
+Subject: [PATCH] Limit newVersion's re.sub to a single replacement
+
+Python 3.7 changed `re.sub` to replace empty matches next to a previous
+non-empty match, which caused `SpecFile.newVersion` to double its
+replacements.  We can use `count=1` to limit this.
+
+ref: https://bugs.python.org/issue32308
+---
+ rpmdev-bumpspec | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec
+index 35e6c9c..06737b5 100755
+--- a/rpmdev-bumpspec
++++ b/rpmdev-bumpspec
+@@ -134,13 +134,13 @@ class SpecFile(object):
+             original = self.lines[i]
+             if self.lines[i].lower().startswith('version:'):
+                 self.lines[i] = re.sub(
+-                    r'[^: \t]*$', v, self.lines[i].rstrip()) + '\n'
++                    r'[^: \t]*$', v, self.lines[i].rstrip(), count=1) + '\n'
+                 changed = changed or self.lines[i] != original
+             elif self.lines[i].lower().startswith('release:'):
+                 # split and reconstruct to preserve whitespace
+                 split = re.split(r':', self.lines[i].rstrip())
+                 self.lines[i] = split[0] + ':' + \
+-                    re.sub(r'[^ \t]*$', r, split[1]) + '\n'
++                    re.sub(r'[^ \t]*$', r, split[1], count=1) + '\n'
+                 changed = changed or self.lines[i] != original
+ 
+         return changed
+-- 
+2.17.2
+

0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch

@@ -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
+

rpmdevtools.spec

@@ -1,23 +1,40 @@
 %global spectool_version 1.0.10
 
+%if 0%{?fedora}
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
 Name:           rpmdevtools
-Version:        8.5
-Release:        1%{?dist}
+Version:        8.10
+Release:        9%{?dist}
 Summary:        RPM Development Tools
 
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
-URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
+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
+Patch0002:      0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch
 
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python >= 2.6
+BuildRequires:  perl-generators
+%if %{with python3}
+BuildRequires:  python3
+BuildRequires:  rpm-python3
+%else
+BuildRequires:  python >= 2.7
 BuildRequires:  rpm-python
+%endif
 # emacs-common >= 1:22.3-3 for macros.emacs
 BuildRequires:  emacs-common >= 1:22.3-3
+BuildRequires:  bash-completion
 %if 0%{?fedora}
 # xemacs-common >= 21.5.29-8 for macros.xemacs
 BuildRequires:  xemacs-common >= 21.5.29-8
@@ -30,9 +47,13 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.3
+%if %{with python3}
+Requires:       rpm-python3
+%else
+Requires:       python >= 2.4
 Requires:       rpm-python
+%endif
 Requires:       sed
 Requires:       emacs-filesystem
 %if 0%{?fedora}
@@ -58,18 +79,26 @@ 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 |"
+%endif
 
 
 %build
 %configure --libdir=%{_prefix}/lib
-make %{?_smp_mflags}
+%make_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
+
+echo %%{_datadir}/bash-completion > %{name}.files
+[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
+echo %%{_sysconfdir}/bash_completion.d > %{name}.files
 
 %if 0%{?fedora}
 for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
@@ -82,12 +111,10 @@ for dir in %{_emacs_sitestartdir} ; do
 done
 
 
-%files
-%{!?_licensedir:%global license %%doc}
+%files -f %{name}.files
 %license COPYING
 %doc NEWS
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
-%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/*
 %{_emacs_sitestartdir}/rpmdev-init.el
@@ -100,6 +127,58 @@ done
 
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 28 2018 Neal Gompa <ngompa13@gmail.com> - 8.10-7
+- Fix regex substitution issues with Python 3.7 (rhbz#1651954)
+
+* 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
+
+* Sat Jan 14 2017 Ville Skyttä <ville.skytta@iki.fi> - 8.10-1
+- Update to 8.10
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 8.9-2
+- Rebuild for Python 3.6
+
+* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.9-1
+- Update to 8.9
+
+* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.8-1
+- Update to 8.8
+
+* Fri Jun 24 2016 Petr Písař <ppisar@redhat.com>
+- Add new mandatory perl build deps
+
+* Thu Jun 23 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.7-1
+- Update to 8.7
+- Specfile cleanups
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun  5 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-2
+- Use python3 on > F-22
+
+* Sun May 10 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-1
+- Update to 8.6
+
 * Mon Oct 20 2014 Ville Skyttä <ville.skytta@iki.fi> - 8.5-1
 - Update to 8.5
 - Mark COPYING as %%license where applicable

sources

@@ -1 +1 @@
-fd2f323c0ede762682985ed746880dd5  rpmdevtools-8.5.tar.xz
+SHA512 (rpmdevtools-8.10.tar.xz) = 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57