Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

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

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
+

progressbar.py

@@ -0,0 +1,133 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# A simple text-based progress bar, compatible with the basic API of:
+# https://github.com/WoLpH/python-progressbar
+#
+# Copyright (C) 2021  Red Hat, Inc.
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+
+
+import shutil
+import sys
+import time
+
+
+class ProgressBar:
+    FORMAT = '{value:>10} / {max_value:<10} [{bars}]'
+    BARS = '= '
+    SPINLEN = 5
+
+    def __init__(self, stream=sys.stderr, max_width=80, fps=10):
+        self._stream = stream
+        self._max_width = max_width
+        self._min_delay = 1 / fps
+
+    @staticmethod
+    def _format_value(value):
+        raise NotImplementedError()
+
+    def start(self, max_value):
+        self._value = 0
+        self._max_value = max_value or 0
+        self._status = dict()
+        self._spinner = 0
+        self._timestamp = 0
+        self.update(0)
+
+    def update(self, value):
+        self._value = value
+        if value > self._max_value:
+            self._max_value = 0
+
+        ts = time.time()
+        if (ts - self._timestamp) < self._min_delay:
+            return
+        self._timestamp = ts
+
+        status = {'value': self._format_value(value),
+                  'max_value': self._format_value(self._max_value) \
+                               if self._max_value else '???',
+                  'bars': ''}
+
+        termw = min(shutil.get_terminal_size()[0], self._max_width)
+        nbars = max(termw - len(self.FORMAT.format(**status)), 0)
+        nfill = nskip = 0
+
+        if self._max_value:
+            nfill = round(nbars * value / self._max_value)
+        elif nbars > self.SPINLEN:
+            nfill = self.SPINLEN
+            nskip = self._spinner % (nbars - self.SPINLEN)
+            self._spinner = nskip + 1
+
+        status['bars'] = self.BARS[1] * nskip + \
+                         self.BARS[0] * nfill + \
+                         self.BARS[1] * (nbars - nfill - nskip)
+
+        if status == self._status:
+            return
+        self._status = status
+
+        self._stream.write('\r')
+        self._stream.write(self.FORMAT.format(**self._status))
+        self._stream.flush()
+
+    def finish(self):
+        self._max_value = self._value
+        self._timestamp = 0  # Force an update
+        self.update(self._value)
+
+        self._stream.write('\n')
+        self._stream.flush()
+
+
+class DataTransferBar(ProgressBar):
+    @staticmethod
+    def _format_value(value):
+        symbols = ' KMGTPEZY'
+        depth = 0
+        max_depth = len(symbols) - 1
+        unit = 1024.0
+
+        # 1023.95 should be formatted as 1.0 (not 1024.0)
+        # More info: https://stackoverflow.com/a/63839503
+        thres = unit - 0.05
+
+        while value >= thres and depth < max_depth:
+            depth += 1
+            value /= unit
+        symbol = ' %siB' % symbols[depth] if depth > 0 else ''
+
+        return '%.1f%s' % (value, symbol)
+
+
+if __name__ == '__main__':
+    # Show a dummy bar for debugging purposes
+
+    bar = DataTransferBar()
+    size = 50*1024*1024
+    chunk = 1024*1234
+    recvd = 0
+
+    bar.start(size)
+    while recvd < (size - chunk):
+        recvd += chunk
+        bar.update(recvd)
+        time.sleep(0.1)
+    bar.update(size)
+    bar.finish()

rpmdevtools-9.5-no_qa_robot.patch

@@ -0,0 +1,21 @@
+diff -up rpmdevtools-9.5/Makefile.am.orig rpmdevtools-9.5/Makefile.am
+--- rpmdevtools-9.5/Makefile.am.orig	2021-12-10 11:37:29.889405680 +0100
++++ rpmdevtools-9.5/Makefile.am	2021-12-10 11:37:34.637495820 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = emacs qa-robot
++SUBDIRS = emacs
+ 
+ pkgsysconfdir = $(sysconfdir)/rpmdevtools
+ bashcompdir = @bashcompdir@
+diff -up rpmdevtools-9.5/Makefile.in.orig rpmdevtools-9.5/Makefile.in
+--- rpmdevtools-9.5/Makefile.in.orig	2021-12-10 11:37:31.073428158 +0100
++++ rpmdevtools-9.5/Makefile.in	2021-12-10 11:37:38.304565439 +0100
+@@ -317,7 +317,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = emacs qa-robot
++SUBDIRS = emacs
+ pkgsysconfdir = $(sysconfdir)/rpmdevtools
+ bin_SCRIPTS = rpmdev-newinit rpmdev-newspec rpmdev-rmdevelrpms
+ dist_bin_SCRIPTS = rpmdev-checksig rpmdev-diff rpmdev-extract rpmdev-md5 \

rpmdevtools.spec

@@ -1,63 +1,62 @@
-%global spectool_version 1.0.10
-
-%if 0%{?fedora} > 22
-%bcond_without python3
-%else
-%bconf_with python3
-%endif
-
 Name:           rpmdevtools
-Version:        8.9
+Version:        9.6
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        RPM Development Tools
 
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
-URL:            https://fedorahosted.org/rpmdevtools/
+URL:            https://pagure.io/rpmdevtools
-Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
+Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
+Source1:        progressbar.py
+
+# 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
+
+# RHEL-specific downstream patches
+## Remove fakeroot dependency (rhbz#1905465)
+Patch2001:      rpmdevtools-9.5-no_qa_robot.patch
 
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
+BuildRequires:  make
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
 BuildRequires:  perl-generators
-%if %{with python3}
+# python dependencies for spectool
-BuildRequires:  python3
+# spectool is executed for creating man page
-BuildRequires:  rpm-python3
+BuildRequires:  python3-devel
-%else
+%if ! 0%{?rhel}
-BuildRequires:  python >= 2.7
+BuildRequires:  python3dist(progressbar2)
-BuildRequires:  rpm-python
 %endif
+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}
-# 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
+%if ! 0%{?rhel}
 Requires:       fakeroot
+%endif
 Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
 Requires:       rpm-build >= 4.4.2.3
-%if %{with python3}
+Requires:       python3dist(argcomplete)
-Requires:       rpm-python3
+%if ! 0%{?rhel}
-%else
+Requires:       python3dist(progressbar2)
-Requires:       python >= 2.4
-Requires:       rpm-python
 %endif
+Requires:       python3dist(requests)
+Requires:       python3dist(rpm)
 Requires:       sed
 Requires:       emacs-filesystem
-%if 0%{?fedora}
+# Optionally support rpmautospec
-Requires:       xemacs-filesystem
+Recommends:     python%{python3_version}dist(rpmautospec)
-%endif
 
 %description
-This package contains scripts and (X)Emacs support files to aid in
+This package contains scripts and Emacs support files to aid in
 development of RPM packages.
 rpmdev-setuptree    Create RPM build tree within user's home directory
 rpmdev-diff         Diff contents of two archives
@@ -67,7 +66,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
@@ -75,10 +74,20 @@ rpmdev-bumpspec     Bump revision in specfile
 
 
 %prep
-%setup -q
+%autosetup -N
-%if %{with python3}
+%autopatch -p1 %{!?rhel:-M2000}
 grep -lF "%{_bindir}/python " * \
 | xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
+
+%if 0%{?rhel}
+# Let spectool find the bundled progressbar2 implementation
+cp %{SOURCE1} .
+sed -i \
+'s|^\(import progressbar\)$|'\
+'import sys\n'\
+'sys.path.insert(1, "%{_datadir}/rpmdevtools")\n'\
+'\1\nsys.path.pop(1)|' \
+rpmdev-spectool
 %endif
 
 
@@ -88,24 +97,27 @@ grep -lF "%{_bindir}/python " * \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %make_install
 
 echo %%{_datadir}/bash-completion > %{name}.files
-[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
+[ -d %{buildroot}%{_sysconfdir}/bash_completion.d ] && \
 echo %%{_sysconfdir}/bash_completion.d > %{name}.files
 
-%if 0%{?fedora}
-for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
-%else
 for dir in %{_emacs_sitestartdir} ; do
-%endif
+  install -dm 755 %{buildroot}$dir
-  install -dm 755 $RPM_BUILD_ROOT$dir
+  ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}$dir
-  ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir
+  touch %{buildroot}$dir/rpmdev-init.elc
-  touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
+# For backwards compatibility
+ln -sr %{buildroot}%{_bindir}/rpmdev-spectool %{buildroot}%{_bindir}/spectool
+echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
+
+%if 0%{?rhel}
+cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/
+%py_byte_compile %{python3} %{buildroot}%{_datadir}/rpmdevtools/
+%endif
+
 
 %files -f %{name}.files
 %license COPYING
@@ -115,14 +127,104 @@ done
 %{_bindir}/*
 %{_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
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* 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
 

sources

@@ -1 +1 @@
-35bab0c28f2af544af53ac1aed598ac0  rpmdevtools-8.9.tar.xz
+SHA512 (rpmdevtools-9.6.tar.xz) = 691fec8944029dbe60cb3eab0200d1201f5aa3dd11cd49e8313ee7c1fe998237217ea9c5ae7b4a70f61f3c998093f23d26266b23f41607ddca3148d5f6b6ae06