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

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

.cvsignore

@@ -1,2 +0,0 @@
-spectool-1.0.10.tar.bz2
-rpmdevtools-7.8.tar.xz

.gitignore

@@ -0,0 +1 @@
+/*.tar.*

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
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: rpmdevtools
-# $Id$
-NAME := rpmdevtools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

rpmdevtools.spec

@@ -1,42 +1,64 @@
-%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%global spectool_version   1.0.10
+%global spectool_version 1.0.10
+
+%if 0%{?fedora}
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
 
 Name:           rpmdevtools
-Version:        7.8
-Release:        1%{?dist}
+Version:        8.10
+Release:        10%{?dist}
 Summary:        RPM Development Tools
 
-Group:          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
-Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
-Patch0:         spectool-1.0.10-sourcenum.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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.4
+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
+%endif
 Provides:       spectool = %{spectool_version}
+Requires:       curl
 Requires:       diffutils
 Requires:       fakeroot
 Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       man
-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:       wget
-# For _get_cword in bash completion snippet
-Conflicts:      bash-completion < 20080705
+Requires:       emacs-filesystem
+%if 0%{?fedora}
+Requires:       xemacs-filesystem
+%endif
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -57,63 +79,170 @@ rpmdev-bumpspec     Bump revision in specfile
 
 
 %prep
-%setup -q -a 1
-cp -p spectool-%{spectool_version}/README README.spectool
-cd spectool-%{spectool_version}
-%patch0 -p1
-cd ..
+%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
 
-install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
+echo %%{_datadir}/bash-completion > %{name}.files
+[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
+echo %%{_sysconfdir}/bash_completion.d > %{name}.files
 
-for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
+%if 0%{?fedora}
+for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
+%else
+for dir in %{_emacs_sitestartdir} ; do
+%endif
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%triggerin -- emacs-common
-[ -d %{emacs_sitestart_d} ] && \
-  ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
-
-%triggerin -- xemacs-common
-[ -d %{xemacs_sitestart_d} ] && \
-  ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{xemacs_sitestart_d} || :
-
-%triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/rpmdev-init.el* || :
-
-%triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/rpmdev-init.el* || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING NEWS README*
+%files -f %{name}.files
+%license COPYING
+%doc NEWS
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
-%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/*
-%ghost %{_datadir}/*emacs
+%{_emacs_sitestartdir}/rpmdev-init.el
+%ghost %{_emacs_sitestartdir}/rpmdev-init.elc
+%if 0%{?fedora}
+%{_xemacs_sitestartdir}/rpmdev-init.el
+%ghost %{_xemacs_sitestartdir}/rpmdev-init.elc
+%endif
 %{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* 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
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Oct 17 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-2
+- Do not require devscripts in any scenario.
+
+* Mon Oct  7 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-1
+- Update to 8.4.
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 8.3-4
+- Perl 5.18 rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Oct 16 2012 Thomas Woerner <twoerner@redhat.com> - 8.3-2
+- xemacs is not available on RHEL (RHBZ#866841)
+
+* Sun Sep  2 2012 Ville Skyttä <ville.skytta@iki.fi> - 8.3-1
+- Update to 8.3.
+- Drop specfile constructs no longer needed with Fedora's rpm.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Nov 12 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.2-1
+- Update to 8.2.
+
+* Tue Apr 26 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.1-1
+- Update to 8.1.
+
+* Tue Mar  1 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.0-3
+- Require xemacs-filesystem on F-15+ (#672093).
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Feb  6 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.0-1
+- Update to 8.0, fixes #519061 and #657594.
+
+* Mon Sep 27 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.10-1
+- Update to 7.10, fixes #595135 and #619867.
+- Patch spectool to work with specfiles containing Icon or BuildArchitectures
+  (#637000).
+
+* Thu May 20 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.9-1
+- Update to 7.9, fixes #588313 and #589705.
+
+* Fri Apr 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-2
+- Require %%{_bindir}/man instead of man (#582932).
+
 * Tue Feb 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-1
 - Update to 7.8, fixes #562316.
 

sources

@@ -1,2 +1 @@
-d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-a495921f4c05cc92018f61cccf6fdfbf  rpmdevtools-7.8.tar.xz
+SHA512 (rpmdevtools-8.10.tar.xz) = 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57

spectool-1.0.10-sourcenum.patch

@@ -1,17 +0,0 @@
-Fix for -s x,y, -p x,y from Todd Zullinger:
-https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html
-
-diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
---- spectool-1.0.10/spectool~	2008-02-12 12:32:21.000000000 +0200
-+++ spectool-1.0.10/spectool	2009-08-21 02:12:56.000000000 +0300
-@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
- 			'v|verbose' => sub { $verbose++; },
- 			'n|dryrun|dry-run' => sub { $dryrun = 1; },
- 			'V|version' => sub { $command = 'version'; },
--			's|source=i' => \@sources,
--			'p|patch=i' => \@patches,
-+			's|source=s' => \@sources,
-+			'p|patch=s' => \@patches,
- 			'S|sources' => sub { push @what, 'sources'; },
- 			'P|patches' => sub { push @what, 'patches'; },
- 			'A|all' => sub { push @what, 'all'; },