From 2e66162ac5f73138c755f639de0d76e4cc9ecd85 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:56:03 -0500 Subject: [PATCH 01/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8a591d3..a8f12fe 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -98,6 +98,9 @@ done %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Oct 17 2013 Ville Skyttä - 8.4-2 - Do not require devscripts in any scenario. From d09042a4c787530ea9376cf13e23b2f1681de572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 20 Oct 2014 21:37:39 +0300 Subject: [PATCH 02/60] Update to 8.5 - Mark COPYING as %license where applicable --- rpmdevtools.spec | 14 ++++++++++---- sources | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a8f12fe..b5f749b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,8 +1,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.4 -Release: 3%{?dist} +Version: 8.5 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -14,7 +14,7 @@ BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man -BuildRequires: python >= 2.4 +BuildRequires: python >= 2.6 BuildRequires: rpm-python # emacs-common >= 1:22.3-3 for macros.emacs BuildRequires: emacs-common >= 1:22.3-3 @@ -83,7 +83,9 @@ done %files -%doc COPYING NEWS +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ @@ -98,6 +100,10 @@ done %changelog +* Mon Oct 20 2014 Ville Skyttä - 8.5-1 +- Update to 8.5 +- Mark COPYING as %%license where applicable + * Sun Jun 08 2014 Fedora Release Engineering - 8.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 56aa2b4..db6d99b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d1d3cc2f1108918be4766143162389a rpmdevtools-8.4.tar.xz +fd2f323c0ede762682985ed746880dd5 rpmdevtools-8.5.tar.xz From c00eb73a5b98cebe79c3d9030449a081563066f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 10 May 2015 20:53:27 +0300 Subject: [PATCH 03/60] Update to 8.6 --- rpmdevtools.spec | 13 ++++++++++--- sources | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b5f749b..b634a07 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,7 +1,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.5 +Version: 8.6 Release: 1%{?dist} Summary: RPM Development Tools @@ -18,6 +18,7 @@ BuildRequires: python >= 2.6 BuildRequires: rpm-python # 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 @@ -71,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +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 %else @@ -82,12 +87,11 @@ for dir in %{_emacs_sitestartdir} ; do done -%files +%files -f %{name}.files %{!?_licensedir:%global license %%doc} %license COPYING %doc NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ -%{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ %{_bindir}/* %{_emacs_sitestartdir}/rpmdev-init.el @@ -100,6 +104,9 @@ done %changelog +* Sun May 10 2015 Ville Skyttä - 8.6-1 +- Update to 8.6 + * Mon Oct 20 2014 Ville Skyttä - 8.5-1 - Update to 8.5 - Mark COPYING as %%license where applicable diff --git a/sources b/sources index db6d99b..679ad55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd2f323c0ede762682985ed746880dd5 rpmdevtools-8.5.tar.xz +daee90323a325efee01257c1e9c6aced rpmdevtools-8.6.tar.xz From f5a5863426828473d6ef2e3c35d2c5833f1a94ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 17 Jun 2015 13:57:43 +0300 Subject: [PATCH 04/60] Use python3 on > F-22 --- rpmdevtools.spec | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b634a07..980fea8 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,8 +1,14 @@ %global spectool_version 1.0.10 +%if 0%{?fedora} > 22 +%bcond_without python3 +%else +%bconf_with python3 +%endif + Name: rpmdevtools Version: 8.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -14,8 +20,13 @@ BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man +%if %{with python3} +BuildRequires: python3 +BuildRequires: rpm-python3 +%else BuildRequires: python >= 2.6 BuildRequires: rpm-python +%endif # emacs-common >= 1:22.3-3 for macros.emacs BuildRequires: emacs-common >= 1:22.3-3 BuildRequires: bash-completion @@ -31,9 +42,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} @@ -60,6 +75,10 @@ rpmdev-bumpspec Bump revision in specfile %prep %setup -q +%if %{with python3} +grep -lF "%{_bindir}/python " * \ +| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |" +%endif %build @@ -104,6 +123,9 @@ done %changelog +* Fri Jun 5 2015 Ville Skyttä - 8.6-2 +- Use python3 on > F-22 + * Sun May 10 2015 Ville Skyttä - 8.6-1 - Update to 8.6 From 90de409997fdc03b0cf510f21be3fcad0690634c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 22:18:41 +0000 Subject: [PATCH 05/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 980fea8..8470bc8 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 8.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 5 2015 Ville Skyttä - 8.6-2 - Use python3 on > F-22 From 72a6c0f3cb9e40b0bc69e4aeca92d17afad2afd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 23 Jun 2016 18:59:47 +0300 Subject: [PATCH 06/60] Update to 8.7 - Specfile cleanups --- rpmdevtools.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8470bc8..293f070 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -7,8 +7,8 @@ %endif Name: rpmdevtools -Version: 8.6 -Release: 3%{?dist} +Version: 8.7 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -24,7 +24,7 @@ BuildRequires: %{_bindir}/pod2man BuildRequires: python3 BuildRequires: rpm-python3 %else -BuildRequires: python >= 2.6 +BuildRequires: python >= 2.7 BuildRequires: rpm-python %endif # emacs-common >= 1:22.3-3 for macros.emacs @@ -83,13 +83,13 @@ grep -lF "%{_bindir}/python " * \ %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 ] && \ @@ -107,7 +107,6 @@ done %files -f %{name}.files -%{!?_licensedir:%global license %%doc} %license COPYING %doc NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ @@ -123,6 +122,10 @@ done %changelog +* Thu Jun 23 2016 Ville Skyttä - 8.7-1 +- Update to 8.7 +- Specfile cleanups + * Thu Feb 04 2016 Fedora Release Engineering - 8.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e5fa7220149190d413f235f7433a2b369c6b1b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 23 Jun 2016 19:00:38 +0300 Subject: [PATCH 07/60] Upload source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 679ad55..3ab1e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -daee90323a325efee01257c1e9c6aced rpmdevtools-8.6.tar.xz +e4cc3fcfd527c76bd3f6685a09784bf6 rpmdevtools-8.7.tar.xz From 314247a49a5f17e9caa905b1385b2624a7b47639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 23 Jun 2016 19:50:21 +0300 Subject: [PATCH 08/60] Work around bug in 8.7's rpmdev-bumpspec.1 build --- rpmdevtools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 293f070..b3128e4 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -83,6 +83,7 @@ grep -lF "%{_bindir}/python " * \ %build %configure --libdir=%{_prefix}/lib +export PATH="$PWD:$PATH" # bug in 8.7's rpmdev-bumpspec.1 build %make_build From 6c092c945e476865e5741738cb74859a4f1b8c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:14:18 +0200 Subject: [PATCH 09/60] Mandatory Perl build-requires added --- rpmdevtools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b3128e4..794ad61 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -20,6 +20,7 @@ BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man +BuildRequires: perl-generators %if %{with python3} BuildRequires: python3 BuildRequires: rpm-python3 From c257bf7df707fe1c70936cf8367cba6655d32cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 25 Jun 2016 13:10:18 +0300 Subject: [PATCH 10/60] Update to 8.8 --- rpmdevtools.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 794ad61..c6e529c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -7,7 +7,7 @@ %endif Name: rpmdevtools -Version: 8.7 +Version: 8.8 Release: 1%{?dist} Summary: RPM Development Tools @@ -84,7 +84,6 @@ grep -lF "%{_bindir}/python " * \ %build %configure --libdir=%{_prefix}/lib -export PATH="$PWD:$PATH" # bug in 8.7's rpmdev-bumpspec.1 build %make_build @@ -124,6 +123,12 @@ done %changelog +* Sat Jun 25 2016 Ville Skyttä - 8.8-1 +- Update to 8.8 + +* Fri Jun 24 2016 Petr Písař +- Add new mandatory perl build deps + * Thu Jun 23 2016 Ville Skyttä - 8.7-1 - Update to 8.7 - Specfile cleanups diff --git a/sources b/sources index 3ab1e70..b069496 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4cc3fcfd527c76bd3f6685a09784bf6 rpmdevtools-8.7.tar.xz +3025a7736efb7425ead9f661c08be2bd rpmdevtools-8.8.tar.xz From 85d8faeb9b0776d1b901e47e40021666506ce190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 25 Jun 2016 15:48:40 +0300 Subject: [PATCH 11/60] Update to 8.9 --- rpmdevtools.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index c6e529c..3906ed8 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -7,7 +7,7 @@ %endif Name: rpmdevtools -Version: 8.8 +Version: 8.9 Release: 1%{?dist} Summary: RPM Development Tools @@ -123,6 +123,9 @@ done %changelog +* Sat Jun 25 2016 Ville Skyttä - 8.9-1 +- Update to 8.9 + * Sat Jun 25 2016 Ville Skyttä - 8.8-1 - Update to 8.8 diff --git a/sources b/sources index b069496..59b172d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3025a7736efb7425ead9f661c08be2bd rpmdevtools-8.8.tar.xz +35bab0c28f2af544af53ac1aed598ac0 rpmdevtools-8.9.tar.xz From 4f5745c71e0fdc19081a0d045dcbe5049ee76bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:38 +0100 Subject: [PATCH 12/60] Rebuild for Python 3.6 --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3906ed8..4494317 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Mon Dec 19 2016 Miro Hrončok - 8.9-2 +- Rebuild for Python 3.6 + * Sat Jun 25 2016 Ville Skyttä - 8.9-1 - Update to 8.9 From 7fba79942257f2bd7061b105e72453ae293cde82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 14 Jan 2017 13:33:47 +0200 Subject: [PATCH 13/60] Clean up obsolete Fedora version check --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 4494317..61e52d5 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ %global spectool_version 1.0.10 -%if 0%{?fedora} > 22 +%if 0%{?fedora} %bcond_without python3 %else %bconf_with python3 From 0032c5270db2c17cff5cc5491c06c9ab662a75ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 14 Jan 2017 13:34:07 +0200 Subject: [PATCH 14/60] Fix non-fedora python3 bcond --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 61e52d5..b1b8a91 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %if 0%{?fedora} %bcond_without python3 %else -%bconf_with python3 +%bcond_with python3 %endif Name: rpmdevtools From d05045c4477dabbca6197c0634a7948e99c9348e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 14 Jan 2017 13:34:18 +0200 Subject: [PATCH 15/60] Point URLs to pagure --- rpmdevtools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b1b8a91..3c2309b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -13,8 +13,8 @@ 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 BuildArch: noarch # help2man, pod2man, *python for creating man pages From be5fa647cde9369cbcf0c7e7080eae4b6a971b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 14 Jan 2017 13:35:08 +0200 Subject: [PATCH 16/60] Update to 8.10 --- rpmdevtools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3c2309b..d266554 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -7,8 +7,8 @@ %endif Name: rpmdevtools -Version: 8.9 -Release: 2%{?dist} +Version: 8.10 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Sat Jan 14 2017 Ville Skyttä - 8.10-1 +- Update to 8.10 + * Mon Dec 19 2016 Miro Hrončok - 8.9-2 - Rebuild for Python 3.6 diff --git a/sources b/sources index 59b172d..0312714 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35bab0c28f2af544af53ac1aed598ac0 rpmdevtools-8.9.tar.xz +SHA512 (rpmdevtools-8.10.tar.xz) = 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57 From 98732e8e314c7270a1c8722681d3040c1d4be7c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:51:13 +0000 Subject: [PATCH 17/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index d266554..891e284 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 8.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Jan 14 2017 Ville Skyttä - 8.10-1 - Update to 8.10 From 154304be4dc40ca905a2f47a1b69a5c7eb428b26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 13:16:48 +0000 Subject: [PATCH 18/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 891e284..0c9e3c6 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 8.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 8.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d65daa3d50a9c3589d9d6f77647c8f0cb5dd0d4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 13:19:09 +0000 Subject: [PATCH 19/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 0c9e3c6..75e81eb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 8.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 8.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 3db610549f720eceebfa7a0335e470d6289c39e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:44:04 +0000 Subject: [PATCH 20/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 75e81eb..adf2097 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -123,6 +123,9 @@ done %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 8.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 8.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f43651e7368e5afb25e9537ee3e5d092650af948 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 16 Sep 2018 07:03:23 -0400 Subject: [PATCH 21/60] Fix regex related deprecation warnings (rhbz#1598089) --- rpmdevtools.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index adf2097..887c29a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -16,6 +16,9 @@ License: GPLv2+ and GPLv2 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 + BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man @@ -75,7 +78,7 @@ 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 |" @@ -123,6 +126,9 @@ done %changelog +* Sun Sep 16 2018 Neal Gompa - 8.10-6 +- Fix regex related deprecation warnings (rhbz#1598089) + * Sat Jul 14 2018 Fedora Release Engineering - 8.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e47f8797e328fc84a80c39dcf98c1769f2165bec Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 16 Sep 2018 07:04:12 -0400 Subject: [PATCH 22/60] Actually add the patch --- ...g-Avoid-python-3.6-regex-related-dep.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch diff --git a/0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch b/0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch new file mode 100644 index 0000000..37a11e3 --- /dev/null +++ b/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?= +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 + From a488e997ab17264d40e816c071810b5625fcc5e3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 28 Nov 2018 23:10:30 -0500 Subject: [PATCH 23/60] Fix regex substitution issues with Python 3.7 (rhbz#1651954) --- ...ion-s-re.sub-to-a-single-replacement.patch | 37 +++++++++++++++++++ rpmdevtools.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch diff --git a/0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch b/0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch new file mode 100644 index 0000000..0efb6a5 --- /dev/null +++ b/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 +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 + diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 887c29a..d0453e2 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -18,6 +18,7 @@ Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.x # 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 @@ -126,6 +127,9 @@ done %changelog +* Wed Nov 28 2018 Neal Gompa - 8.10-7 +- Fix regex substitution issues with Python 3.7 (rhbz#1651954) + * Sun Sep 16 2018 Neal Gompa - 8.10-6 - Fix regex related deprecation warnings (rhbz#1598089) From 6df48968299d7d2292f904146c94cb3b741ed901 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:35:38 +0000 Subject: [PATCH 24/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index d0453e2..d50acce 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -127,6 +127,9 @@ done %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 8.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 28 2018 Neal Gompa - 8.10-7 - Fix regex substitution issues with Python 3.7 (rhbz#1651954) From acb4cf9573e3ac3a6f59800ddac6ce93f895a52b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:46:22 +0000 Subject: [PATCH 25/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index d50acce..f0736bb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -127,6 +127,9 @@ done %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 8.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 8.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From cabbc608ac87e6281a614bfcf377e5c2dfd8c06b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:52:38 +0000 Subject: [PATCH 26/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index f0736bb..4b9ffe4 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 9%{?dist} +Release: 10%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -127,6 +127,9 @@ done %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 8.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 8.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5d3221a2cc7cce4618c64ce781a3ebe0366d3910 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 25 Mar 2020 14:42:54 +0100 Subject: [PATCH 27/60] Add perl dependencies needed for build --- rpmdevtools.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 4b9ffe4..9887dac 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,7 +8,7 @@ Name: rpmdevtools Version: 8.10 -Release: 10%{?dist} +Release: 11%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -25,6 +25,13 @@ BuildArch: noarch BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: perl-generators +# perl dependencies for spectool +# spectool is executed for creating man page +BuildRequires: perl(FileHandle) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(strict) %if %{with python3} BuildRequires: python3 BuildRequires: rpm-python3 @@ -127,6 +134,9 @@ done %changelog +* Wed Mar 25 2020 Jitka Plesnikova - 8.10-11 +- Add perl dependencies needed for build + * Thu Jan 30 2020 Fedora Release Engineering - 8.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 28701c0ee0273c22f3a81cbb7aaa55675c2dcd58 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 7 Jul 2020 15:35:50 +0000 Subject: [PATCH 28/60] Minor conditional tweak for ELN Signed-off-by: Troy Dawson tdawson@redhat.com --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9887dac..40d56cd 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ %global spectool_version 1.0.10 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without python3 %else %bcond_with python3 From 6bbfd36f3c04dfbb6c8f8ed88cb5f95a03c32f2a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 14 Jul 2020 22:04:19 -0400 Subject: [PATCH 29/60] Update to 9.0 --- ...ion-s-re.sub-to-a-single-replacement.patch | 37 ----------- ...g-Avoid-python-3.6-regex-related-dep.patch | 44 ------------- rpmdevtools.spec | 66 +++++++------------ sources | 2 +- 4 files changed, 24 insertions(+), 125 deletions(-) delete mode 100644 0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch delete mode 100644 0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch diff --git a/0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch b/0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch deleted file mode 100644 index 0efb6a5..0000000 --- a/0001-Limit-newVersion-s-re.sub-to-a-single-replacement.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ea772dae0d8bb266233c3fd9e2012281a821ef44 Mon Sep 17 00:00:00 2001 -From: Josh Stone -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 - diff --git a/0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch b/0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch deleted file mode 100644 index 37a11e3..0000000 --- a/0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 693c9549280b78860b756b593b5922bf3be46888 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -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 - diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 40d56cd..9cc11ea 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,14 +1,6 @@ -%global spectool_version 1.0.10 - -%if 0%{?fedora} || 0%{?rhel} >= 9 -%bcond_without python3 -%else -%bcond_with python3 -%endif - Name: rpmdevtools -Version: 8.10 -Release: 11%{?dist} +Version: 9.0 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -16,29 +8,17 @@ License: GPLv2+ and GPLv2 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: perl-generators -# perl dependencies for spectool +# python dependencies for spectool # spectool is executed for creating man page -BuildRequires: perl(FileHandle) -BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(strict) -%if %{with python3} -BuildRequires: python3 -BuildRequires: rpm-python3 -%else -BuildRequires: python >= 2.7 -BuildRequires: rpm-python -%endif +BuildRequires: python3-devel +BuildRequires: python3dist(progressbar2) +BuildRequires: python3dist(requests-download) +BuildRequires: python3dist(rpm) # emacs-common >= 1:22.3-3 for macros.emacs BuildRequires: emacs-common >= 1:22.3-3 BuildRequires: bash-completion @@ -46,7 +26,6 @@ BuildRequires: bash-completion # 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 @@ -55,12 +34,10 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.3 -%if %{with python3} -Requires: rpm-python3 -%else -Requires: python >= 2.4 -Requires: rpm-python -%endif +Requires: python%{python3_version}dist(argcomplete) +Requires: python%{python3_version}dist(progressbar2) +Requires: python%{python3_version}dist(requests-download) +Requires: python%{python3_version}dist(rpm) Requires: sed Requires: emacs-filesystem %if 0%{?fedora} @@ -78,7 +55,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 @@ -87,10 +64,8 @@ rpmdev-bumpspec Bump revision in specfile %prep %autosetup -p1 -%if %{with python3} grep -lF "%{_bindir}/python " * \ | xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |" -%endif %build @@ -99,12 +74,10 @@ 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} @@ -112,11 +85,15 @@ 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 + install -dm 755 %{buildroot}$dir + ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}$dir + touch %{buildroot}$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 + %files -f %{name}.files %license COPYING @@ -134,6 +111,9 @@ done %changelog +* Tue Jul 14 2020 Neal Gompa - 9.0-1 +- Update to 9.0 + * Wed Mar 25 2020 Jitka Plesnikova - 8.10-11 - Add perl dependencies needed for build diff --git a/sources b/sources index 0312714..de53bf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-8.10.tar.xz) = 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57 +SHA512 (rpmdevtools-9.0.tar.xz) = ace319089773440e7a36cc57ef32656f2fe0f4715b16ac9fb9bc96a02a02c40704b3ec274f0e45dc0f8b8968e0265d7b1fdddccaf983b7e671fa5d36902c613d From 97e6f2e98d31b6d085f71eadd528bf69bd69e45b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 16 Jul 2020 11:20:41 -0400 Subject: [PATCH 30/60] Backport fix for python spec template --- ...hon-Fix-conditional-for-manual-requi.patch | 25 +++++++++++++++++++ rpmdevtools.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-spectemplate-python-Fix-conditional-for-manual-requi.patch diff --git a/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch b/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch new file mode 100644 index 0000000..39570ad --- /dev/null +++ b/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch @@ -0,0 +1,25 @@ +From 75861583181839623bc9a6ea63ed7932d18f4f57 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Thu, 16 Jul 2020 11:19:03 -0400 +Subject: [PATCH] spectemplate-python: Fix conditional for manual requires + +--- + spectemplate-python.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spectemplate-python.spec b/spectemplate-python.spec +index 08ecffe..3625ca1 100644 +--- a/spectemplate-python.spec ++++ b/spectemplate-python.spec +@@ -25,7 +25,7 @@ BuildRequires: python%{python3_pkgversion}-setuptools + Summary: %{summary} + %{?python_provide:%python_provide python3-%{pypi_name}} + +-%if %{defined python_enable_dependency_generator} || %{defined python_disable_dependency_generator} ++%if %{undefined python_enable_dependency_generator} && %{undefined python_disable_dependency_generator} + # Put manual requires here: + Requires: python%{python3_pkgversion}-foo + %endif +-- +2.26.2 + diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9cc11ea..19c9d10 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -8,6 +8,9 @@ License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-spectemplate-python-Fix-conditional-for-manual-requi.patch + BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man @@ -111,6 +114,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Thu Jul 16 2020 Neal Gompa - 9.0-2 +- Backport fix for python spec template + * Tue Jul 14 2020 Neal Gompa - 9.0-1 - Update to 9.0 From bd1538f3728fbf4adffdebe5daee7896c6f67440 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:55:48 +0000 Subject: [PATCH 31/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 19c9d10..a2fc882 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -114,6 +114,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 16 2020 Neal Gompa - 9.0-2 - Backport fix for python spec template From b679b19442b3fd85d59648d0b51133d34c275339 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 20 Aug 2020 07:25:04 -0400 Subject: [PATCH 32/60] Update to 9.1 --- ...hon-Fix-conditional-for-manual-requi.patch | 25 ------------------- rpmdevtools.spec | 10 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 0001-spectemplate-python-Fix-conditional-for-manual-requi.patch diff --git a/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch b/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch deleted file mode 100644 index 39570ad..0000000 --- a/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 75861583181839623bc9a6ea63ed7932d18f4f57 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Thu, 16 Jul 2020 11:19:03 -0400 -Subject: [PATCH] spectemplate-python: Fix conditional for manual requires - ---- - spectemplate-python.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spectemplate-python.spec b/spectemplate-python.spec -index 08ecffe..3625ca1 100644 ---- a/spectemplate-python.spec -+++ b/spectemplate-python.spec -@@ -25,7 +25,7 @@ BuildRequires: python%{python3_pkgversion}-setuptools - Summary: %{summary} - %{?python_provide:%python_provide python3-%{pypi_name}} - --%if %{defined python_enable_dependency_generator} || %{defined python_disable_dependency_generator} -+%if %{undefined python_enable_dependency_generator} && %{undefined python_disable_dependency_generator} - # Put manual requires here: - Requires: python%{python3_pkgversion}-foo - %endif --- -2.26.2 - diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a2fc882..e214d38 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools -Version: 9.0 -Release: 3%{?dist} +Version: 9.1 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -8,9 +8,6 @@ License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz -# Backports from upstream -Patch0001: 0001-spectemplate-python-Fix-conditional-for-manual-requi.patch - BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man @@ -114,6 +111,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Thu Aug 20 2020 Neal Gompa - 9.1-1 +- Update to 9.1 + * Wed Jul 29 2020 Fedora Release Engineering - 9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index de53bf3..7220fbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.0.tar.xz) = ace319089773440e7a36cc57ef32656f2fe0f4715b16ac9fb9bc96a02a02c40704b3ec274f0e45dc0f8b8968e0265d7b1fdddccaf983b7e671fa5d36902c613d +SHA512 (rpmdevtools-9.1.tar.xz) = de39b526b685961a2a3d3ea948f471e690e0409c3a5209a106a2bcc6ebe43ebda29d936793d5fc995405e1c98163adb3291c389731ebcea5fa7466f1d0b8227e From 7f9552cabf3e88993a3590ecc2039a72171e2abc Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 5 Oct 2020 18:45:58 -0400 Subject: [PATCH 33/60] Update to 9.2 --- rpmdevtools.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e214d38..28ac31a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,5 +1,5 @@ Name: rpmdevtools -Version: 9.1 +Version: 9.2 Release: 1%{?dist} Summary: RPM Development Tools @@ -111,6 +111,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Mon Oct 05 2020 Neal Gompa - 9.2-1 +- Update to 9.2 + * Thu Aug 20 2020 Neal Gompa - 9.1-1 - Update to 9.1 diff --git a/sources b/sources index 7220fbd..7876fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.1.tar.xz) = de39b526b685961a2a3d3ea948f471e690e0409c3a5209a106a2bcc6ebe43ebda29d936793d5fc995405e1c98163adb3291c389731ebcea5fa7466f1d0b8227e +SHA512 (rpmdevtools-9.2.tar.xz) = fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff From a08b8cede8520f66c190b0f38c930f899c475e85 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:53:32 +0000 Subject: [PATCH 34/60] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- rpmdevtools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 28ac31a..66d5b10 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -10,6 +10,7 @@ Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.x BuildArch: noarch # help2man, pod2man, *python for creating man pages +BuildRequires: make BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: perl-generators From d5f84e780e0b19ee7c32ab9b61749fc74227d279 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 20 Jan 2021 06:59:05 -0500 Subject: [PATCH 35/60] Update to 9.3 --- rpmdevtools.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 66d5b10..8277b6e 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,5 +1,5 @@ Name: rpmdevtools -Version: 9.2 +Version: 9.3 Release: 1%{?dist} Summary: RPM Development Tools @@ -10,7 +10,7 @@ Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.x BuildArch: noarch # help2man, pod2man, *python for creating man pages -BuildRequires: make +BuildRequires: make BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: perl-generators @@ -18,7 +18,7 @@ BuildRequires: perl-generators # spectool is executed for creating man page BuildRequires: python3-devel BuildRequires: python3dist(progressbar2) -BuildRequires: python3dist(requests-download) +BuildRequires: python3dist(requests) BuildRequires: python3dist(rpm) # emacs-common >= 1:22.3-3 for macros.emacs BuildRequires: emacs-common >= 1:22.3-3 @@ -112,6 +112,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Wed Jan 20 2021 Neal Gompa - 9.3-1 +- Update to 9.3 + * Mon Oct 05 2020 Neal Gompa - 9.2-1 - Update to 9.2 diff --git a/sources b/sources index 7876fbc..7afdac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.2.tar.xz) = fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff +SHA512 (rpmdevtools-9.3.tar.xz) = 87dc8fe2885db2760a7520bc2486655f64e778bce0b6b3c2904ba9f3689e13f5b8d186b6fcebd60f24e958333aae66d06c0690fe2db633c2f508068dd4215f9f From 9d1d240447d201fedd0617d8fcbd0144e8f0bd2a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 20 Jan 2021 07:01:52 -0500 Subject: [PATCH 36/60] Force legacy datestamp by default until rhbz#1715412 is resolved --- ...estamp-while-RHBZ-1715412-is-still-a.patch | 39 +++++++++++++++++++ rpmdevtools.spec | 5 +++ 2 files changed, 44 insertions(+) create mode 100644 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch diff --git a/0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch b/0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch new file mode 100644 index 0000000..f59bdfd --- /dev/null +++ b/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 +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 + diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8277b6e..0b47787 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -8,6 +8,10 @@ License: GPLv2+ and GPLv2 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 @@ -114,6 +118,7 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog * Wed Jan 20 2021 Neal Gompa - 9.3-1 - Update to 9.3 +- Force legacy datestamp by default until rhbz#1715412 is resolved * Mon Oct 05 2020 Neal Gompa - 9.2-1 - Update to 9.2 From fe6aa3d1c81a798d3228007d13497358b18b18f5 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Fri, 22 Jan 2021 10:56:13 +0100 Subject: [PATCH 37/60] Replace requests-download dependency with requests Respective upstream change: https://pagure.io/rpmdevtools/pull-request/74 --- rpmdevtools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 0b47787..0bd9b05 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -41,7 +41,7 @@ Requires: grep Requires: rpm-build >= 4.4.2.3 Requires: python%{python3_version}dist(argcomplete) Requires: python%{python3_version}dist(progressbar2) -Requires: python%{python3_version}dist(requests-download) +Requires: python%{python3_version}dist(requests) Requires: python%{python3_version}dist(rpm) Requires: sed Requires: emacs-filesystem @@ -116,6 +116,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Fri Jan 22 2021 Michal Domonkos - 9.3-2 +- Replace requests-download dependency with requests + * Wed Jan 20 2021 Neal Gompa - 9.3-1 - Update to 9.3 - Force legacy datestamp by default until rhbz#1715412 is resolved From 26bfd64822198d5cc2f517736c2aeef41a0c9a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 Jan 2021 12:40:27 +0100 Subject: [PATCH 38/60] spectool: Download text as text --- 77.patch | 33 +++++++++++++++++++++++++++++++++ rpmdevtools.spec | 9 ++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 77.patch diff --git a/77.patch b/77.patch new file mode 100644 index 0000000..ff603cf --- /dev/null +++ b/77.patch @@ -0,0 +1,33 @@ +From 6a582f49fa958e4ba3e374d0e77d814524111dfb Mon Sep 17 00:00:00 2001 +From: Miro Hrončok +Date: Jan 23 2021 13:15:35 +0000 +Subject: Use Accept-Encoding: identity together with decode_content=False + + +This should fix both the issues: + + - gzips decompressed: https://pagure.io/rpmdevtools/issue/72 + - texts compressed: https://pagure.io/rpmdevtools/issue/76 + + $ file tor-0.4.5.4-rc.tar.gz tor-0.4.5.4-rc.tar.gz.asc xrootd-5.0.3.tar.gz + tor-0.4.5.4-rc.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 35962880 + tor-0.4.5.4-rc.tar.gz.asc: PGP signature Signature (old) + xrootd-5.0.3.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 981462405 + +--- + +diff --git a/rpmdev-spectool b/rpmdev-spectool +index 56a2d43..a324fab 100755 +--- a/rpmdev-spectool ++++ b/rpmdev-spectool +@@ -239,6 +239,9 @@ def download(url, target, headers=None, tracker: Optional[ProgressTracker] = Non + headers = {} + + headers.setdefault("User-Agent", "rpmdev-spectool") ++ # identity should prevent servers from sending gzip-compressed text ++ # which would later not be decompressed because we set decode_content=False ++ headers.setdefault("Accept-Encoding", "identity") + + ret = requests.get(url, headers=headers, stream=True) + ret.raise_for_status() + diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 0bd9b05..91d86ce 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -8,6 +8,10 @@ License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz +# Use Accept-Encoding: identity together with decode_content=False +# This is to avoid text files downloaded gzipped +Patch1: https://pagure.io/rpmdevtools/pull-request/77.patch + # 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 @@ -116,6 +120,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Mon Jan 25 2021 Miro Hrončok - 9.3-3 +- spectool: Download text as text + * Fri Jan 22 2021 Michal Domonkos - 9.3-2 - Replace requests-download dependency with requests From 4ae7f0e5c806c1dafe8f797eda9669b2dc5475a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:27:39 +0000 Subject: [PATCH 39/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 91d86ce..3fc6419 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -120,6 +120,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 25 2021 Miro Hrončok - 9.3-3 - spectool: Download text as text From 5e5734dc7e0662591c02815c8dc7a081c62be884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 15 Feb 2021 13:53:15 +0100 Subject: [PATCH 40/60] Require any Python version of the Python packages When we update Python, rpmdevtools should not need a rebuild. They install to Python version agnostic directories. Hence, they need python3dist() packages, not python3.Xdist(). --- rpmdevtools.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3fc6419..6c27e38 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -43,10 +43,10 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.3 -Requires: python%{python3_version}dist(argcomplete) -Requires: python%{python3_version}dist(progressbar2) -Requires: python%{python3_version}dist(requests) -Requires: python%{python3_version}dist(rpm) +Requires: python3dist(argcomplete) +Requires: python3dist(progressbar2) +Requires: python3dist(requests) +Requires: python3dist(rpm) Requires: sed Requires: emacs-filesystem %if 0%{?fedora} @@ -120,6 +120,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Mon Feb 15 2021 Miro Hrončok - 9.3-5 +- Require any Python version of the Python packages + * Wed Jan 27 2021 Fedora Release Engineering - 9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e77bf671a5d1d974a222598650ade92dac485225 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 17 Jul 2021 07:38:38 -0400 Subject: [PATCH 41/60] Update to 9.4 --- 77.patch | 33 --------------------------------- rpmdevtools.spec | 13 +++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 77.patch diff --git a/77.patch b/77.patch deleted file mode 100644 index ff603cf..0000000 --- a/77.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6a582f49fa958e4ba3e374d0e77d814524111dfb Mon Sep 17 00:00:00 2001 -From: Miro Hrončok -Date: Jan 23 2021 13:15:35 +0000 -Subject: Use Accept-Encoding: identity together with decode_content=False - - -This should fix both the issues: - - - gzips decompressed: https://pagure.io/rpmdevtools/issue/72 - - texts compressed: https://pagure.io/rpmdevtools/issue/76 - - $ file tor-0.4.5.4-rc.tar.gz tor-0.4.5.4-rc.tar.gz.asc xrootd-5.0.3.tar.gz - tor-0.4.5.4-rc.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 35962880 - tor-0.4.5.4-rc.tar.gz.asc: PGP signature Signature (old) - xrootd-5.0.3.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 981462405 - ---- - -diff --git a/rpmdev-spectool b/rpmdev-spectool -index 56a2d43..a324fab 100755 ---- a/rpmdev-spectool -+++ b/rpmdev-spectool -@@ -239,6 +239,9 @@ def download(url, target, headers=None, tracker: Optional[ProgressTracker] = Non - headers = {} - - headers.setdefault("User-Agent", "rpmdev-spectool") -+ # identity should prevent servers from sending gzip-compressed text -+ # which would later not be decompressed because we set decode_content=False -+ headers.setdefault("Accept-Encoding", "identity") - - ret = requests.get(url, headers=headers, stream=True) - ret.raise_for_status() - diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 6c27e38..ac9de9c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools -Version: 9.3 -Release: 5%{?dist} +Version: 9.4 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -8,10 +8,6 @@ License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz -# Use Accept-Encoding: identity together with decode_content=False -# This is to avoid text files downloaded gzipped -Patch1: https://pagure.io/rpmdevtools/pull-request/77.patch - # 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 @@ -52,6 +48,8 @@ Requires: emacs-filesystem %if 0%{?fedora} 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 @@ -120,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Sat Jul 17 2021 Neal Gompa - 9.4-1 +- Update to 9.4 + * Mon Feb 15 2021 Miro Hrončok - 9.3-5 - Require any Python version of the Python packages diff --git a/sources b/sources index 7afdac1..c79623d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.3.tar.xz) = 87dc8fe2885db2760a7520bc2486655f64e778bce0b6b3c2904ba9f3689e13f5b8d186b6fcebd60f24e958333aae66d06c0690fe2db633c2f508068dd4215f9f +SHA512 (rpmdevtools-9.4.tar.xz) = 848e6d0df7ae7c42fba670eb22f869defff3aaabce0aa491e08bfcd1acfc93a1f0e1cef49d7d452ecda52b22f238a8aad6aa8402ca7d1ec5087fcd516a179e45 From a98cb59a666c227bdad5dc184e4336a3f8c27469 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 17 Jul 2021 12:32:36 -0400 Subject: [PATCH 42/60] Update to 9.5 --- rpmdevtools.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ac9de9c..c846463 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,5 +1,5 @@ Name: rpmdevtools -Version: 9.4 +Version: 9.5 Release: 1%{?dist} Summary: RPM Development Tools @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Sat Jul 17 2021 Neal Gompa - 9.5-1 +- Update to 9.5 + * Sat Jul 17 2021 Neal Gompa - 9.4-1 - Update to 9.4 diff --git a/sources b/sources index c79623d..c538562 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.4.tar.xz) = 848e6d0df7ae7c42fba670eb22f869defff3aaabce0aa491e08bfcd1acfc93a1f0e1cef49d7d452ecda52b22f238a8aad6aa8402ca7d1ec5087fcd516a179e45 +SHA512 (rpmdevtools-9.5.tar.xz) = d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a From 66116af6c1bba3399ea968cbd4ba057e6686151a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:36:34 +0000 Subject: [PATCH 43/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index c846463..2e83517 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 17 2021 Neal Gompa - 9.5-1 - Update to 9.5 From 02ad6bd4b1986cf123abb6b425ff9ed20dcd3fc8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Nov 2021 19:26:06 -0700 Subject: [PATCH 44/60] Drop XEmacs support in F36 and later --- rpmdevtools.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 2e83517..2777342 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -27,7 +27,7 @@ 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} +%if 0%{?fedora} && 0%{?fedora} < 36 # xemacs-common >= 21.5.29-8 for macros.xemacs BuildRequires: xemacs-common >= 21.5.29-8 %endif @@ -45,7 +45,7 @@ Requires: python3dist(requests) Requires: python3dist(rpm) Requires: sed Requires: emacs-filesystem -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 36 Requires: xemacs-filesystem %endif # Optionally support rpmautospec @@ -87,7 +87,7 @@ echo %%{_datadir}/bash-completion > %{name}.files [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ] && \ echo %%{_sysconfdir}/bash_completion.d > %{name}.files -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 36 for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do %else for dir in %{_emacs_sitestartdir} ; do @@ -110,7 +110,7 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %{_bindir}/* %{_emacs_sitestartdir}/rpmdev-init.el %ghost %{_emacs_sitestartdir}/rpmdev-init.elc -%if 0%{?fedora} +%if 0%{?fedora} && 0%{fedora} < 36 %{_xemacs_sitestartdir}/rpmdev-init.el %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc %endif @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Tue Nov 9 2021 Jerry James - 9.5-3 +- Drop XEmacs support in F36 and later + * Fri Jul 23 2021 Fedora Release Engineering - 9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ab2c7755dcd2fbf44e1f9788fb0271c0267b617e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:02:38 +0000 Subject: [PATCH 45/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 2777342..3255e53 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 9 2021 Jerry James - 9.5-3 - Drop XEmacs support in F36 and later From d2e1b4863086d7faa562ed9800c14d011473407d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 4 Feb 2022 18:03:30 -0500 Subject: [PATCH 46/60] Update to 9.6 --- rpmdevtools.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3255e53..50672b8 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools -Version: 9.5 -Release: 4%{?dist} +Version: 9.6 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Fri Feb 04 2022 Neal Gompa - 9.6-1 +- Update to 9.6 + * Fri Jan 21 2022 Fedora Release Engineering - 9.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index c538562..4bb8a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmdevtools-9.5.tar.xz) = d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a +SHA512 (rpmdevtools-9.6.tar.xz) = 691fec8944029dbe60cb3eab0200d1201f5aa3dd11cd49e8313ee7c1fe998237217ea9c5ae7b4a70f61f3c998093f23d26266b23f41607ddca3148d5f6b6ae06 From daaa5ba8a69b0fe66b570a73b8379ce7dd0fcbe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:02:30 +0000 Subject: [PATCH 47/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 50672b8..cb027d9 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Feb 04 2022 Neal Gompa - 9.6-1 - Update to 9.6 From 6331051938c68421a97275d0866cc97643b9baf2 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 13 Oct 2022 09:33:54 -0700 Subject: [PATCH 48/60] Fix bad conditional --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index cb027d9..9a97485 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -110,7 +110,7 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %{_bindir}/* %{_emacs_sitestartdir}/rpmdev-init.el %ghost %{_emacs_sitestartdir}/rpmdev-init.elc -%if 0%{?fedora} && 0%{fedora} < 36 +%if 0%{?fedora} && 0%{?fedora} < 36 %{_xemacs_sitestartdir}/rpmdev-init.el %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc %endif From af0e25c44d0a53066e653d25a3816d6db97181a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:57:40 +0000 Subject: [PATCH 49/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9a97485..c3e2ec1 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -118,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 9.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 302155c3041bbcbf8669ebf84ea3988751912593 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Apr 2023 22:50:58 -0400 Subject: [PATCH 50/60] Import C9S changes This drops the unwanted fakeroot and python3-progressbar2 dependencies from RHEL/ELN builds, and also removes obsolete F<36 conditionals. --- progressbar.py | 133 ++++++++++++++++++++++++++++++ rpmdevtools-9.5-no_qa_robot.patch | 21 +++++ rpmdevtools.spec | 47 +++++++---- 3 files changed, 184 insertions(+), 17 deletions(-) create mode 100644 progressbar.py create mode 100644 rpmdevtools-9.5-no_qa_robot.patch diff --git a/progressbar.py b/progressbar.py new file mode 100644 index 0000000..c822e29 --- /dev/null +++ b/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() diff --git a/rpmdevtools-9.5-no_qa_robot.patch b/rpmdevtools-9.5-no_qa_robot.patch new file mode 100644 index 0000000..1e17765 --- /dev/null +++ b/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 \ diff --git a/rpmdevtools.spec b/rpmdevtools.spec index c3e2ec1..a93d1c3 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -7,11 +7,16 @@ Summary: RPM Development Tools License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools 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 @@ -21,38 +26,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} && 0%{?fedora} < 36 -# 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: python3dist(argcomplete) +%if ! 0%{?rhel} Requires: python3dist(progressbar2) +%endif Requires: python3dist(requests) Requires: python3dist(rpm) Requires: sed 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 +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 +74,22 @@ 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 \ +'s|^\(import progressbar\)$|'\ +'import sys\n'\ +'sys.path.insert(1, "%{_datadir}/rpmdevtools")\n'\ +'\1\nsys.path.pop(1)|' \ +rpmdev-spectool +%endif + %build %configure --libdir=%{_prefix}/lib @@ -87,11 +103,7 @@ echo %%{_datadir}/bash-completion > %{name}.files [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ] && \ echo %%{_sysconfdir}/bash_completion.d > %{name}.files -%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 @@ -101,6 +113,11 @@ 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 %license COPYING @@ -110,10 +127,6 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %{_bindir}/* %{_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]* From 3f4f7d2e30c70b74b9e6bc4fabc27298b04aeedb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:05:42 +0000 Subject: [PATCH 51/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a93d1c3..bdbc29a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -131,6 +131,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From dc545ca9482275edcefb0f1979db9687ca7910e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 25 Aug 2023 10:27:18 +0200 Subject: [PATCH 52/60] Convert a license tag to SPDX format --- rpmdevtools.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index bdbc29a..d5a3c7e 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,10 +1,11 @@ Name: rpmdevtools Version: 9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM Development Tools -# rpmdev-setuptree is GPLv2, everything else GPLv2+ -License: GPLv2+ and GPLv2 +# rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, +# 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 @@ -131,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Fri Aug 25 2023 Petr Pisar - 9.6-5 +- Convert a license tag to SPDX format + * Fri Jul 21 2023 Fedora Release Engineering - 9.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 401ab23b44f862a0d889c746aee13f74f0a5295a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 11:59:47 +0000 Subject: [PATCH 53/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index d5a3c7e..7185a53 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -132,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 9.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 25 2023 Petr Pisar - 9.6-5 - Convert a license tag to SPDX format From dd63de6d120e1e586a80cac8bac788ccd8a5cdb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:21:43 +0000 Subject: [PATCH 54/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 7185a53..a07688a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -132,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 9.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 9.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 60f1fea2fbd3940a75578ab3d01ec096eb2ab5a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:49:52 +0000 Subject: [PATCH 55/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a07688a..084f9d2 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -132,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 9.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 9.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 866bfe8ed55a29ed5d6046ed7e283d6e6301836b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 22:43:28 +0000 Subject: [PATCH 56/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 084f9d2..24c9c8b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -132,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 9.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 9.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2e6a03f01b709b45a5eeb00e008253f8981bf12f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 23 Jan 2025 16:10:01 +0800 Subject: [PATCH 57/60] update to latest git 83b35ac changes --- 0002-rpmdevtools-git-83b35ac.patch | 531 +++++++++++++++++++++++++++++ rpmdevtools.spec | 8 +- 2 files changed, 538 insertions(+), 1 deletion(-) create mode 100644 0002-rpmdevtools-git-83b35ac.patch diff --git a/0002-rpmdevtools-git-83b35ac.patch b/0002-rpmdevtools-git-83b35ac.patch new file mode 100644 index 0000000..ff616da --- /dev/null +++ b/0002-rpmdevtools-git-83b35ac.patch @@ -0,0 +1,531 @@ +diff --git a/Makefile.am b/Makefile.am +index bb6f7c6..d55f397 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -15,7 +15,7 @@ man8_MANS = rpmdev-rmdevelrpms.8 + dist_pkgsysconf_DATA = curlrc newspec.conf rmdevelrpms.conf \ + spectemplate-lib.spec spectemplate-minimal.spec \ + spectemplate-perl.spec spectemplate-php-pear.spec \ +- spectemplate-python.spec spectemplate-ruby.spec \ ++ spectemplate-python.spec spectemplate-pyproject.spec spectemplate-ruby.spec \ + spectemplate-ocaml.spec spectemplate-R.spec spectemplate-dummy.spec \ + template.init + +diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec +index b8f4047..5a6a909 100755 +--- a/rpmdev-bumpspec ++++ b/rpmdev-bumpspec +@@ -27,8 +27,10 @@ import time + + try: + from rpmautospec import specfile_uses_rpmautospec ++ from rpmautospec.subcommands.release import calculate_release_number + except ImportError: + specfile_uses_rpmautospec = None ++ calculate_release_number = None + + __version__ = "1.0.13" + +@@ -378,19 +380,25 @@ the Free Software Foundation; either version 2 of the License, or + # Not actually a parser error, but... meh. + parser.error(e) + +- uses_rpmautospec = False ++ uses_rpmautospec_autorelease = uses_rpmautospec_autochangelog = False + if specfile_uses_rpmautospec: +- uses_rpmautospec = specfile_uses_rpmautospec( ++ uses_rpmautospec_autorelease = specfile_uses_rpmautospec( + specpath=s.filename, + check_autorelease=True, + check_autochangelog=False + ) ++ uses_rpmautospec_autochangelog = specfile_uses_rpmautospec( ++ specpath=s.filename, ++ check_autorelease=False, ++ check_autochangelog=True ++ ) + +- if uses_rpmautospec: ++ changed = False ++ if uses_rpmautospec_autorelease: + if opts.new: + print("RPMAutoSpec usage detected, only setting Version.") + changed = s.newVersion(opts.new, set_release=False) +- else: ++ elif uses_rpmautospec_autochangelog: + print("RPMAutoSpec usage detected, not changing the spec file.") + continue + else: +@@ -405,14 +413,12 @@ the Free Software Foundation; either version 2 of the License, or + + changed = True + +- # If we didn't change anything, no need to write and modify the +- # changelog. + if changed: ++ # Write out changed version or release if changed. + s.writeFile(aspec) +- else: +- continue + +- if uses_rpmautospec: ++ if uses_rpmautospec_autochangelog: ++ print("RPMAutospec %autochangelog is used, no need to add %changelog entry.") + continue + + if not s.checkChangelogPresence(): +@@ -422,6 +428,10 @@ the Free Software Foundation; either version 2 of the License, or + # Get EVR for changelog entry. + cmd = ("rpm", "-q", "--specfile", "--define", "dist %{nil}", + "--qf=%|epoch?{%{epoch}:}:{}|%{version}-%{release}\n", aspec) ++ if not opts.new and calculate_release_number and uses_rpmautospec_autorelease: ++ # Rpmautospec doesn’t see a change yet so the calculated number will be one too low. ++ release_number = calculate_release_number(aspec) + 1 ++ cmd += ("--define", "_rpmautospec_release_number {}".format(release_number)) + popen = subprocess.Popen(cmd, stdout=subprocess.PIPE) + evr = popen.communicate()[0].split(b"\n")[0] + if sys.version_info[0] > 2: +diff --git a/rpmdev-spectool b/rpmdev-spectool +index 1d57256..2c06ef8 100755 +--- a/rpmdev-spectool ++++ b/rpmdev-spectool +@@ -25,7 +25,9 @@ import os + import tempfile + import time + from collections import OrderedDict +-from typing import Optional ++from typing import Any, Callable, Dict, List, Optional ++from typing import OrderedDict as OrderedDictT ++from typing import Tuple + from urllib.parse import urlparse + + import progressbar +@@ -46,13 +48,13 @@ anything about missing sources or patches). The plan is to catch errors like + this in spectool itself and warn the user about it in the future.""" + + +-def complete_spec_paths(prefix, **kwargs): ++def complete_spec_paths(prefix, **kwargs) -> List[str]: + import glob + + return glob.glob(prefix + "*.spec") + + +-def get_args() -> dict: ++def get_args() -> Dict[str, Any]: + try: + import argcomplete + except ImportError: +@@ -191,6 +193,15 @@ def get_args() -> dict: + help="output debug info, don't clean up when done", + ) + ++ misc.add_argument( ++ "--http-header", ++ "-H", ++ action="append", ++ dest="headers", ++ default=[], ++ help="Optionally add custom headers", ++ ) ++ + specfile = parser.add_argument("specfile", action="store") + + if argcomplete: +@@ -202,17 +213,17 @@ def get_args() -> dict: + return vars(parser.parse_args()) + + +-def split_numbers(args: str) -> list: ++def split_numbers(args: str) -> List[str]: + return args.split(",") + + + # simple streamed file download progress tracker inspired by requests_download + class ProgressTracker: +- def __init__(self, progress_bar: progressbar.ProgressBar): ++ def __init__(self, progress_bar: progressbar.ProgressBar) -> None: + self.progress_bar = progress_bar + self.received = 0 + +- def on_start(self, response: requests.Response): ++ def on_start(self, response: requests.Response) -> None: + max_value = None + + if "content-length" in response.headers: +@@ -221,7 +232,7 @@ class ProgressTracker: + self.progress_bar.start(max_value=max_value) + self.received = 0 + +- def on_chunk(self, chunk: bytes): ++ def on_chunk(self, chunk: bytes) -> None: + self.received += len(chunk) + + try: +@@ -229,12 +240,13 @@ class ProgressTracker: + except ValueError: + pass + +- def on_finish(self): ++ def on_finish(self) -> None: + self.progress_bar.finish() + + + # simple streamed file download implementation inspired by requests_download +-def download(url, target, headers=None, tracker: Optional[ProgressTracker] = None): ++def download(url, target, headers=None, ++ tracker: Optional[ProgressTracker] = None) -> None: + if headers is None: + headers = {} + +@@ -263,7 +275,8 @@ def download(url, target, headers=None, tracker: Optional[ProgressTracker] = Non + tracker.on_finish() + + +-def get_file(url: str, path: str, force: bool) -> bool: ++def get_file(url: str, path: str, force: bool, ++ headers: Optional[Dict[str, str]] = None) -> bool: + if os.path.exists(path): + if force: + os.remove(path) +@@ -272,13 +285,13 @@ def get_file(url: str, path: str, force: bool) -> bool: + return False + + progress = ProgressTracker(progressbar.DataTransferBar()) +- download(url, path, tracker=progress) ++ download(url, path, tracker=progress, headers=headers) + + return True + + + class Spec: +- def __init__(self, path: str): ++ def __init__(self, path: str) -> None: + self.path = path + self.spec = rpm.spec(self.path) + +@@ -289,10 +302,10 @@ class Spec: + self.files = list(self.spec.sources) + self.files.sort(key=(lambda file: file[1])) + +- self._sources = None +- self._patches = None ++ self._sources: Optional[OrderedDictT[str, str]] = None ++ self._patches: Optional[OrderedDictT[str, str]] = None + +- def _files(self, typ) -> OrderedDict: ++ def _files(self, typ: int) -> OrderedDictT[str, str]: + # file is a 3-tuple of (path, number, type) + # type 1: source file + # type 2: patch file +@@ -305,41 +318,42 @@ class Spec: + return files + + @property +- def sources(self) -> OrderedDict: ++ def sources(self) -> OrderedDictT[str, str]: + if not self._sources: + self._sources = self._files(1) + + return self._sources + + @property +- def patches(self) -> OrderedDict: ++ def patches(self) -> OrderedDictT[str, str]: + if not self._patches: + self._patches = self._files(2) + + return self._patches + +- def print_source(self, number: int, value: str = None): ++ def print_source(self, number: str, value: Optional[str] = None) -> None: + if not value: + value = self.sources[number] + + print("Source{}: {}".format(number, value)) + +- def print_patch(self, number: int, value: str = None): ++ def print_patch(self, number: str, value: Optional[str] = None) -> None: + if not value: + value = self.patches[number] + + print("Patch{}: {}".format(number, value)) + +- def list_sources(self): ++ def list_sources(self) -> None: + for (number, value) in self.sources.items(): + self.print_source(number, value) + +- def list_patches(self): ++ def list_patches(self) -> None: + for (number, value) in self.patches.items(): + self.print_patch(number, value) + + @staticmethod +- def _get_file(value: str, directory: str, force: bool, dry: bool): ++ def _get_file(value: str, directory: str, force: bool, dry: bool, ++ headers: Optional[Dict[str, str]] = None) -> None: + parsed = urlparse(value) + + if "#" not in value: +@@ -354,19 +368,23 @@ class Spec: + return + + if parsed.scheme: ++ if dry: ++ print("Would have downloaded: {}".format(value)) ++ return None + if not dry: + path = os.path.join(directory, basename) + + try: + print("Downloading: {}".format(value)) + os.makedirs(directory, exist_ok=True) +- really = get_file(value, path, force) ++ really = get_file(value, path, force, headers=headers) + if really: + print("Downloaded: {}".format(basename)) + + except IOError as e: + print("Download failed:") + print(e) ++ raise e + + except KeyboardInterrupt: + if os.path.isfile(path): +@@ -376,28 +394,53 @@ class Spec: + print("Download cancelled.") + raise + +- else: +- print("Would have downloaded: {}".format(value)) +- +- def get_source(self, number: int, directory: str, force: bool, dry: bool, value: str = None): ++ def get_source(self, number: str, directory: str, force: bool, dry: bool, ++ value: Optional[str] = None, ++ headers: Optional[Dict[str, str]] = None) -> bool: + if not value: + value = self.sources[number] + +- self._get_file(value, directory, force, dry) ++ try: ++ self._get_file(value, directory, force, dry, headers=headers) ++ return False ++ ++ except IOError: ++ return True + +- def get_patch(self, number: int, directory: str, force: bool, dry: bool, value: str = None): ++ def get_patch(self, number: str, directory: str, force: bool, dry: bool, ++ value: Optional[str] = None, ++ headers: Optional[Dict[str, str]] = None) -> bool: + if not value: + value = self.patches[number] + +- self._get_file(value, directory, force, dry) ++ try: ++ self._get_file(value, directory, force, dry, headers=headers) ++ return False ++ ++ except IOError: ++ return True ++ ++ def get_sources(self, directory: str, force: bool, dry: bool, ++ headers: Optional[Dict[str, str]] = None): ++ failure = False + +- def get_sources(self, directory: str, force: bool, dry: bool): + for number, value in self.sources.items(): +- self.get_source(number, directory, force, dry, value) ++ if self.get_source(number, directory, force, dry, value, ++ headers=headers): ++ failure = True ++ ++ return failure ++ ++ def get_patches(self, directory: str, force: bool, dry: bool, ++ headers: Optional[Dict[str, str]] = None): ++ failure = False + +- def get_patches(self, directory: str, force: bool, dry: bool): + for number, value in self.patches.items(): +- self.get_patch(number, directory, force, dry, value) ++ if self.get_patch(number, directory, force, dry, value, ++ headers=headers): ++ failure = True ++ ++ return failure + + + def main() -> int: +@@ -484,6 +527,10 @@ def main() -> int: + if args["get_files"]: + force = args["force"] + dry = args["dry_run"] ++ headers = {} ++ for header in args["headers"]: ++ k, sep, v = header.partition(':') ++ headers[k.strip()] = v.strip() + + if args["directory"] and args["sourcedir"]: + print("Conflicting requests for download directory.") +@@ -496,18 +543,21 @@ def main() -> int: + else: + directory = os.getcwd() + ++ tasks: List[Tuple[Callable[..., bool], Tuple[Any, ...]]] = [] ++ + if args["source"]: + numbers = split_numbers(args["source"]) + + for number in numbers: + if number not in spec.sources.keys(): +- print("No patch with number '{}' found.".format(number)) ++ print("No source with number '{}' found.".format(number)) + continue + +- spec.get_source(number, directory, force, dry) ++ tasks.append((spec.get_source, (number, directory, force, dry, ++ headers))) + + elif args["sources"] and not args["patch"]: +- spec.get_sources(directory, force, dry) ++ tasks.append((spec.get_sources, (directory, force, dry, headers))) + + if args["patch"]: + numbers = split_numbers(args["patch"]) +@@ -517,10 +567,22 @@ def main() -> int: + print("No patch with number '{}' found.".format(number)) + continue + +- spec.get_patch(number, directory, force, dry) ++ tasks.append((spec.get_patch, (number, directory, force, dry, ++ headers))) + + elif args["patches"] and not args["source"]: +- spec.get_patches(directory, force, dry) ++ tasks.append((spec.get_patches, (directory, force, dry, headers))) ++ ++ failure = False ++ ++ for task, fargs in tasks: ++ fail = task(*fargs) ++ ++ if fail: ++ failure = True ++ ++ if failure: ++ return 1 + + return 0 + +diff --git a/spectemplate-cmake.spec b/spectemplate-cmake.spec +new file mode 100644 +index 0000000..0cdcbb8 +--- /dev/null ++++ b/spectemplate-cmake.spec +@@ -0,0 +1,38 @@ ++Name: ++Version: ++Release: 1%{?dist} ++Summary: ++ ++License: ++URL: ++Source0: ++ ++BuildRequires: cmake ++ ++%description ++%{summary}. ++ ++ ++%prep ++%autosetup -q ++ ++ ++%build ++%cmake ++%cmake_build ++ ++ ++%install ++%cmake_install ++ ++ ++%check ++%ctest ++ ++ ++%files ++%license add-license-file-here ++%doc add-docs-here ++ ++ ++%changelog +diff --git a/spectemplate-pyproject.spec b/spectemplate-pyproject.spec +new file mode 100644 +index 0000000..15d5a65 +--- /dev/null ++++ b/spectemplate-pyproject.spec +@@ -0,0 +1,60 @@ ++Name: python-... ++Version: ... ++Release: 1%{?dist} ++Summary: ... ++ ++License: ... ++URL: https://... ++# use a source from git forge or PyPI: ++Source: %{url}/archive/v%{version}/...-%{version}.tar.gz / %{pypi_source ...} ++ ++# for pure Python packages: ++BuildArch: noarch ++# for packages with extension modules: ++BuildRequires: gcc ++ ++BuildRequires: python3-devel ++ ++%global _description %{expand: ++...} ++ ++%description %_description ++ ++%package -n python3-... ++Summary: %{summary} ++ ++%description -n python3-... %_description ++ ++ ++%prep ++%autosetup -p1 -n ...-%{version} ++ ++ ++%generate_buildrequires ++# use the appropriate flags to get all test dependencies: ++%pyproject_buildrequires -x... / -t ++ ++ ++%build ++%pyproject_wheel ++ ++ ++%install ++%pyproject_install ++# list the installed top-level Python module names: ++%pyproject_save_files ... ++ ++ ++%check ++# testing the package is mandatory, at least somehow: ++%tox / %pytest / %pyproject_check_import ... ++ ++ ++%files -n python3-... -f %{pyproject_files} ++%doc README.* ++# only add LICENSE / COPYING if not included in %%{pyproject_files} ++%license LICENSE / COPYING ++%{_bindir}/... ++ ++ ++%changelog diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 24c9c8b..b2f7fca 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 9%{?dist} +Release: 10%{?dist}.git83b35ac Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -13,6 +13,8 @@ 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 +## latest unreleased changes from git +Patch1002: 0002-rpmdevtools-git-83b35ac.patch # RHEL-specific downstream patches ## Remove fakeroot dependency (rhbz#1905465) @@ -93,6 +95,7 @@ rpmdev-spectool %build +autoreconf # remove for new release %configure --libdir=%{_prefix}/lib %make_build @@ -132,6 +135,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Thu Jan 23 2025 Jens Petersen - 9.6-10.git83b35ac +- update to latest git 83b35ac changes + * Sat Jan 18 2025 Fedora Release Engineering - 9.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6ce9455bd623cd0fcb495818c224822963651f4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:07:10 +0000 Subject: [PATCH 58/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b2f7fca..5cd29fb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 10%{?dist}.git83b35ac +Release: 11%{?dist}.git83b35ac Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -135,6 +135,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 9.6-11.git83b35ac +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 23 2025 Jens Petersen - 9.6-10.git83b35ac - update to latest git 83b35ac changes From 1b8f9ed759728e31678322a234f5583ede953879 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Aug 2025 21:12:58 +0200 Subject: [PATCH 59/60] Fix F43 FTBFS - Add BuildRequires for autoreconf Patch1002 needs autoreconf, see %build. Add autoconf and automake BuildRequires. Resolves: #2385580 rpmdevtools: FTBFS in Fedora rawhide/f43 https://bugzilla.redhat.com/show_bug.cgi?id=2385580 --- rpmdevtools.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 5cd29fb..ed65c00 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 11%{?dist}.git83b35ac +Release: 12%{?dist}.git83b35ac Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -15,6 +15,8 @@ Source1: progressbar.py Patch1001: 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch ## latest unreleased changes from git Patch1002: 0002-rpmdevtools-git-83b35ac.patch +# Patch1002 needs autoreconf, see %%build below, remove for new release +BuildRequires: autoconf automake # RHEL-specific downstream patches ## Remove fakeroot dependency (rhbz#1905465) @@ -135,6 +137,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Mon Aug 04 2025 Mark Wielaard - 9.6-12.git83b35ac +- Add BuildRequires for autoreconf, fixes rhbz#2385580 + * Fri Jul 25 2025 Fedora Release Engineering - 9.6-11.git83b35ac - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 62a3f4726ec7d26ba35cf1d5954baff93a74a679 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 9 Aug 2025 17:24:22 +0200 Subject: [PATCH 60/60] Revert to last stable release; Fixes RHBZ#2387173 The bump to a git snapshot of upstream commit 83b35ac was never built except during the F43 mass rebuild, and actually introduced regressions. --- rpmdevtools.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ed65c00..86879d9 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.6 -Release: 12%{?dist}.git83b35ac +Release: 13%{?dist} Summary: RPM Development Tools # rpmdev-md5 and rpmdev-setuptree are GPL-2.0-only, @@ -13,10 +13,6 @@ 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 -## latest unreleased changes from git -Patch1002: 0002-rpmdevtools-git-83b35ac.patch -# Patch1002 needs autoreconf, see %%build below, remove for new release -BuildRequires: autoconf automake # RHEL-specific downstream patches ## Remove fakeroot dependency (rhbz#1905465) @@ -97,7 +93,6 @@ rpmdev-spectool %build -autoreconf # remove for new release %configure --libdir=%{_prefix}/lib %make_build @@ -137,6 +132,9 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog +* Sat Aug 09 2025 Fabio Valentini - 9.6-13 +- Revert to last stable release + * Mon Aug 04 2025 Mark Wielaard - 9.6-12.git83b35ac - Add BuildRequires for autoreconf, fixes rhbz#2385580