Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch

@@ -0,0 +1,39 @@
+From 4a4693c842b6da5d66e3a6bdb1eb7914d2402f7f Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Wed, 20 Jan 2021 06:50:03 -0500
+Subject: [PATCH] Force legacy datestamp while RHBZ#1715412 is still an issue
+
+---
+ rpmdev-bumpspec   | 2 +-
+ rpmdev-newspec.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec
+index dc4eb05..3e18b41 100755
+--- a/rpmdev-bumpspec
++++ b/rpmdev-bumpspec
+@@ -300,7 +300,7 @@ the Free Software Foundation; either version 2 of the License, or
+     parser.add_option("-n", "--new",
+                       help="set new version and reset/set release "
+                       "(simple spec files only)")
+-    parser.add_option("-D", "--legacy-datestamp", default=False, action='store_true',
++    parser.add_option("-D", "--legacy-datestamp", default=True, action='store_true',
+                       help="use legacy datestamp for changelog entries")
+     parser.add_option("-d", "--datestamp",
+                       help="changelog date string (default: today)")
+diff --git a/rpmdev-newspec.in b/rpmdev-newspec.in
+index 27af10f..a083dd9 100644
+--- a/rpmdev-newspec.in
++++ b/rpmdev-newspec.in
+@@ -293,7 +293,7 @@ if [[ $NEWSPEC_PREFER_MACROS ]] ; then
+ "
+ fi
+ 
+-if [[ $rpmver -ge 41400 ]] && [[ -z $NEWSPEC_LEGACY_DATESTAMP ]] ; then # >= 4.14 (RHEL >= 8, Fedora >= 27)
++if [[ $rpmver -ge 41400 ]] && [[ $(/bin/false) ]] ; then # >= 4.14 (RHEL >= 8, Fedora >= 27)
+     chlog="s|^%changelog\\s*|%changelog\\n* $(LC_ALL=C date +'%a %b %d %T %Z %Y') $(rpmdev-packager)\\n- |Mg"
+ else
+     chlog="s|^%changelog\\s*|%changelog\\n* $(LC_ALL=C date --utc +'%a %b %d %Y') $(rpmdev-packager)\\n- |Mg"
+-- 
+2.29.2
+

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,55 @@
-%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
-
 Name:           rpmdevtools
-Version:        7.8
-Release:        1%{?dist}
+Version:        9.6
+Release:        2%{?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
+
+# Fedora-specific downstream patches
+## Force legacy datestamp by default until rhbz#1715412 is resolved
+Patch1001:      0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
 
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
+BuildRequires:  make
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python >= 2.4
-BuildRequires:  rpm-python
-Provides:       spectool = %{spectool_version}
+BuildRequires:  perl-generators
+# python dependencies for spectool
+# spectool is executed for creating man page
+BuildRequires:  python3-devel
+BuildRequires:  python3dist(progressbar2)
+BuildRequires:  python3dist(requests)
+BuildRequires:  python3dist(rpm)
+# emacs-common >= 1:22.3-3 for macros.emacs
+BuildRequires:  emacs-common >= 1:22.3-3
+BuildRequires:  bash-completion
+%if 0%{?fedora} && 0%{?fedora} < 36
+# xemacs-common >= 21.5.29-8 for macros.xemacs
+BuildRequires:  xemacs-common >= 21.5.29-8
+%endif
+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
-Requires:       rpm-python
+Requires:       python3dist(argcomplete)
+Requires:       python3dist(progressbar2)
+Requires:       python3dist(requests)
+Requires:       python3dist(rpm)
 Requires:       sed
-Requires:       wget
-# For _get_cword in bash completion snippet
-Conflicts:      bash-completion < 20080705
+Requires:       emacs-filesystem
+%if 0%{?fedora} && 0%{?fedora} < 36
+Requires:       xemacs-filesystem
+%endif
+# Optionally support rpmautospec
+Recommends:     python%{python3_version}dist(rpmautospec)
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -49,7 +62,7 @@ rpmdev-checksig     Check package signatures using alternate RPM keyring
 rpminfo             Print information about executables and libraries
 rpmdev-md5/sha*     Display checksums of all files in an archive file
 rpmdev-vercmp       RPM version comparison checker
-spectool            Expand and download sources and patches in specfiles
+rpmdev-spectool     Expand and download sources and patches in specfiles
 rpmdev-wipetree     Erase all files within dirs created by rpmdev-setuptree
 rpmdev-extract      Extract various archives, "tar xvf" style
 rpmdev-bumpspec     Bump revision in specfile
@@ -57,63 +70,225 @@ 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
+grep -lF "%{_bindir}/python " * \
+| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
 
 
 %build
 %configure --libdir=%{_prefix}/lib
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install
 
-make install DESTDIR=$RPM_BUILD_ROOT
+echo %%{_datadir}/bash-completion > %{name}.files
+[ -d %{buildroot}%{_sysconfdir}/bash_completion.d ] && \
+echo %%{_sysconfdir}/bash_completion.d > %{name}.files
 
-install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
-
-for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
-  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
+%if 0%{?fedora} && 0%{?fedora} < 36
+for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
+%else
+for dir in %{_emacs_sitestartdir} ; do
+%endif
+  install -dm 755 %{buildroot}$dir
+  ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}$dir
+  touch %{buildroot}$dir/rpmdev-init.elc
 done
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# For backwards compatibility
+ln -sr %{buildroot}%{_bindir}/rpmdev-spectool %{buildroot}%{_bindir}/spectool
+echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
 
 
-%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} && 0%{fedora} < 36
+%{_xemacs_sitestartdir}/rpmdev-init.el
+%ghost %{_xemacs_sitestartdir}/rpmdev-init.elc
+%endif
 %{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Feb 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 9.6-1
+- Update to 9.6
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov  9 2021 Jerry James <loganjerry@gmail.com> - 9.5-3
+- Drop XEmacs support in F36 and later
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 17 2021 Neal Gompa <ngompa@fedoraproject.org> - 9.5-1
+- Update to 9.5
+
+* Sat Jul 17 2021 Neal Gompa <ngompa@fedoraproject.org> - 9.4-1
+- Update to 9.4
+
+* Mon Feb 15 2021 Miro Hrončok <mhroncok@redhat.com> - 9.3-5
+- Require any Python version of the Python packages
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 25 2021 Miro Hrončok <mhroncok@redhat.com> - 9.3-3
+- spectool: Download text as text
+
+* Fri Jan 22 2021 Michal Domonkos <mdomonko@redhat.com> - 9.3-2
+- Replace requests-download dependency with requests
+
+* Wed Jan 20 2021 Neal Gompa <ngompa13@gmail.com> - 9.3-1
+- Update to 9.3
+- Force legacy datestamp by default until rhbz#1715412 is resolved
+
+* Mon Oct 05 2020 Neal Gompa <ngompa13@gmail.com> - 9.2-1
+- Update to 9.2
+
+* Thu Aug 20 2020 Neal Gompa <ngompa13@gmail.com> - 9.1-1
+- Update to 9.1
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Neal Gompa <ngompa13@gmail.com> - 9.0-2
+- Backport fix for python spec template
+
+* Tue Jul 14 2020 Neal Gompa <ngompa13@gmail.com> - 9.0-1
+- Update to 9.0
+
+* Wed Mar 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 8.10-11
+- Add perl dependencies needed for build
+
+* 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-9.6.tar.xz) = 691fec8944029dbe60cb3eab0200d1201f5aa3dd11cd49e8313ee7c1fe998237217ea9c5ae7b4a70f61f3c998093f23d26266b23f41607ddca3148d5f6b6ae06

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'; },