.gitignore

@@ -1 +1 @@
-SOURCES/rpmdevtools-9.5.tar.xz
+SOURCES/rpmdevtools-9.6.tar.xz

.rpmdevtools.metadata

@@ -1 +1 @@
-4432c26735efe656fcf67febb984c3e9b71c587d SOURCES/rpmdevtools-9.5.tar.xz
+b86e11d69be901b903042fb73cf59cb101eb84e6 SOURCES/rpmdevtools-9.6.tar.xz

SPECS/rpmdevtools.spec

@@ -1,10 +1,11 @@
 Name:           rpmdevtools
-Version:        9.5
+Version:        9.6
-Release:        1%{?dist}
+Release:        9%{?dist}
 Summary:        RPM Development Tools
 
-# rpmdev-setuptree is GPLv2, everything else GPLv2+
+# rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only,
-License:        GPLv2+ and GPLv2
+# everything else is GPL-2.0-or-later.
+License:        GPL-2.0-or-later AND GPL-2.0-only
 URL:            https://pagure.io/rpmdevtools
 Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 Source1:        progressbar.py
@@ -26,33 +27,37 @@ BuildRequires:  perl-generators
 # python dependencies for spectool
 # spectool is executed for creating man page
 BuildRequires:  python3-devel
+%if ! 0%{?rhel}
+BuildRequires:  python3dist(progressbar2)
+%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
 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
-Requires:       python%{python3_version}dist(argcomplete)
+Requires:       python3dist(argcomplete)
-Requires:       python%{python3_version}dist(requests)
+%if ! 0%{?rhel}
-Requires:       python%{python3_version}dist(rpm)
+Requires:       python3dist(progressbar2)
+%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
@@ -70,10 +75,12 @@ rpmdev-bumpspec     Bump revision in specfile
 
 
 %prep
-%autosetup -p1
+%autosetup -N
+%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 \
@@ -82,6 +89,7 @@ sed -i \
 'sys.path.insert(1, "%{_datadir}/rpmdevtools")\n'\
 '\1\nsys.path.pop(1)|' \
 rpmdev-spectool
+%endif
 
 
 %build
@@ -96,11 +104,7 @@ echo %%{_datadir}/bash-completion > %{name}.files
 [ -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
   ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}$dir
   touch %{buildroot}$dir/rpmdev-init.elc
@@ -110,8 +114,10 @@ done
 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
@@ -122,27 +128,58 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/
 %{_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 Dec 10 2021 Michal Domonkos <mdomonko@redhat.com> - 9.5-1
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 9.6-9
-- Rebase to 9.5 (#2005756)
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 9.6-8
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 9.6-8
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Aug 25 2023 Petr Pisar <ppisar@redhat.com> - 9.6-5
+- Convert a license tag to SPDX format
+
+* 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
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 9.3-7
+* Sat Jul 17 2021 Neal Gompa <ngompa@fedoraproject.org> - 9.5-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to 9.5
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 9.3-6
+* Sat Jul 17 2021 Neal Gompa <ngompa@fedoraproject.org> - 9.4-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Update to 9.4
 
-* Thu Feb 11 2021 Michal Domonkos <mdomonko@redhat.com> - 9.3-5
+* Mon Feb 15 2021 Miro Hrončok <mhroncok@redhat.com> - 9.3-5
-- Drop progressbar2 dependency and bundle a tiny replacement (#1927784)
+- Require any Python version of the Python packages
-- Drop fakeroot dependency and qa-robot scripts (#1905465)
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild