From eda72d9a7df499a46e5529977abc456c7f4bb53f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 4 Nov 2006 18:50:01 +0000 Subject: [PATCH 001/107] Initialize branch EL-5 for rpmdevtools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 888d65e18eb7de257b28b56cfa073e30899d0ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 5 Jul 2007 22:09:09 +0000 Subject: [PATCH 002/107] =?UTF-8?q?-=20Remove=20check-{buildroot,rpaths*},?= =?UTF-8?q?=20now=20included=20in=20rpm-build=20>=3D=204.4.2.1.=20-=20Drop?= =?UTF-8?q?=20explicit=20dependency=20on=20patch,=20pulled=20in=20by=20rec?= =?UTF-8?q?ent=20rpm-build.=20-=20Add=20cmake=20and=20scons=20to=20default?= =?UTF-8?q?=20devel=20package=20list=20in=20rpmdev-rmdevelrpms.=20-=20Add?= =?UTF-8?q?=20LSB=20comment=20block=20to=20init=20script=20template.=20Wed?= =?UTF-8?q?=20Jun=2027=202007=20Ville=20Skytt=C3=A4=20=20-=20Add=202-argument=20form=20for=20comparing=20EV?= =?UTF-8?q?R=20strings=20to=20rpmdev-vercmp=20(available=20=20=20=20=20onl?= =?UTF-8?q?y=20if=20rpmUtils.miscutils=20is=20available).=20Sat=20Jun=2016?= =?UTF-8?q?=202007=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Include=20rpmsodiff=20and=20dependencies=20(rpmargs,=20rpme?= =?UTF-8?q?lfsym,=20rpmfile,=20rpmpeek,=20=20=20=20=20rpmsoname)=20from=20?= =?UTF-8?q?ALT=20Linux's=20qa-robot=20package.=20-=20Include=20rpmls=20(#2?= =?UTF-8?q?13778).=20Fri=20Jun=2015=202007=20Ville=20Skytt=C3=A4=20=20-=20Update=20spectool=20to=201.0.9=20(#?= =?UTF-8?q?243731).=20Wed=20Apr=2011=202007=20Ville=20Skytt=C3=A4=20=20-=20Add=20--list-only=20option=20to=20?= =?UTF-8?q?rmdevelrpms=20(Thorsten=20Leemhuis).=20Tue=20Mar=2013=202007=20?= =?UTF-8?q?Ville=20Skytt=C3=A4=20=20-=20BR=20p?= =?UTF-8?q?erl(ExtUtils::MakeMaker)=20by=20default=20in=20perl=20spec=20te?= =?UTF-8?q?mplate.=20-=20Drop=20deprecated=20backwards=20compatibility=20w?= =?UTF-8?q?ith=20fedora-rpmdevtools.=20-=20Update=20URL.=20Wed=20Nov=208?= =?UTF-8?q?=202006=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Arch-qualify=20output=20of=20matched=20packages=20in=20rmde?= =?UTF-8?q?velrpms=20and=20allow=20=20=20=20=20arch-qualified=20packages?= =?UTF-8?q?=20in=20the=20config=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 +-- rpmdevtools.spec | 90 +++++++++++++++++++++++++++++------------------- sources | 4 +-- 3 files changed, 59 insertions(+), 39 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7076111..b858574 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-5.3.tar.bz2 -spectool-1.0.8.tar.bz2 +rpmdevtools-6.0.tar.bz2 +spectool-1.0.9.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a76e961..1e2595d 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,28 +1,42 @@ %define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define spectool_version 1.0.8 +%define spectool_version 1.0.9 Name: rpmdevtools -Version: 5.3 +Version: 6.0 Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools License: GPL -URL: http://fedora.redhat.com/ +URL: http://fedoraproject.org/ Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Provides: spectool = %{spectool_version} -Provides: fedora-rpmdevtools = %{version} Obsoletes: fedora-rpmdevtools < 5.0 # Required for tool operations -Requires: rpm-python, python, cpio, sed, perl, wget, file +Requires: rpm-python +Requires: python +Requires: cpio +Requires: sed +Requires: perl +Requires: wget +Requires: file +Requires: fakeroot # Minimal RPM build requirements -Requires: rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch -Requires: diffutils, gzip, bzip2, unzip +Requires: rpm-build >= 4.4.2.1 +Requires: gcc +Requires: gcc-c++ +Requires: redhat-rpm-config +Requires: make +Requires: tar +Requires: diffutils +Requires: gzip +Requires: bzip2 +Requires: unzip %description This package contains scripts and (X)Emacs support files to aid in @@ -38,6 +52,7 @@ rpmdev-vercmp RPM version comparison checker 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 +...and many more. %prep @@ -63,36 +78,11 @@ for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc done -# Backwards compatibility symlinks -ln -s rpmdev-checksig $RPM_BUILD_ROOT%{_bindir}/fedora-rpmchecksig -ln -s rpmdev-diff $RPM_BUILD_ROOT%{_bindir}/fedora-diffarchive -ln -s rpmdev-extract $RPM_BUILD_ROOT%{_bindir}/fedora-extract -ln -s rpmdev-md5 $RPM_BUILD_ROOT%{_bindir}/fedora-md5 -ln -s rpmdev-newspec $RPM_BUILD_ROOT%{_bindir}/fedora-newrpmspec -ln -s rpmdev-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}/fedora-rmdevelrpms -ln -s rpmdev-setuptree $RPM_BUILD_ROOT%{_bindir}/fedora-buildrpmtree -ln -s rpmdev-vercmp $RPM_BUILD_ROOT%{_bindir}/fedora-rpmvercmp -ln -s rpmdev-wipetree $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree -ln -s rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo - - -%check -make check - %clean rm -rf $RPM_BUILD_ROOT -%post -# Upgrade from fedora-rpmdevtools: -oldconf=%{_sysconfdir}/fedora/rmdevelrpms.conf -if [ $1 -eq 1 -a -f $oldconf ] ; then - echo "5615a64d80f6e6b4df77b3ab0ef1469c $oldconf" \ - | md5sum -c --status - >/dev/null 2>&1 || \ - cat $oldconf > %{_sysconfdir}/rpmdevtools/rmdevelrpms.conf || : -fi - %triggerin -- emacs-common [ -d %{emacs_sitestart_d} ] && \ ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || : @@ -113,13 +103,43 @@ fi %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_datadir}/rpmdevtools/ -%{_bindir}/* -%{_prefix}/lib/rpm/check-* +%{_bindir}/rpm* +%{_bindir}/spectool %ghost %{_datadir}/*emacs -%{_mandir}/man?/*.* +%{_mandir}/man[18]/rpm*.[18]* %changelog +* Thu Jul 5 2007 Ville Skyttä - 6.0-1 +- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. +- Drop explicit dependency on patch, pulled in by recent rpm-build. +- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms. +- Add LSB comment block to init script template. + +* Wed Jun 27 2007 Ville Skyttä +- Add 2-argument form for comparing EVR strings to rpmdev-vercmp + (available only if rpmUtils.miscutils is available). + +* Sat Jun 16 2007 Ville Skyttä +- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, + rpmsoname) from ALT Linux's qa-robot package. +- Include rpmls (#213778). + +* Fri Jun 15 2007 Ville Skyttä +- Update spectool to 1.0.9 (#243731). + +* Wed Apr 11 2007 Ville Skyttä +- Add --list-only option to rmdevelrpms (Thorsten Leemhuis). + +* Tue Mar 13 2007 Ville Skyttä +- BR perl(ExtUtils::MakeMaker) by default in perl spec template. +- Drop deprecated backwards compatibility with fedora-rpmdevtools. +- Update URL. + +* Wed Nov 8 2006 Ville Skyttä +- Arch-qualify output of matched packages in rmdevelrpms and allow + arch-qualified packages in the config file. + * Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. diff --git a/sources b/sources index ddfa0e5..f67da29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 -42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 +7582b4f7c8ab6121b57ae2807a40c6ec rpmdevtools-6.0.tar.bz2 +b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 From 51dbc45a6f2140b7788a1d77c0c988dc3f68a48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 10 Aug 2007 19:10:17 +0000 Subject: [PATCH 003/107] =?UTF-8?q?-=20Sync=20COPYING=20with=20http://www.?= =?UTF-8?q?gnu.org/licenses/old-licenses/gpl-2.0.txt=20Mon=20Aug=206=20200?= =?UTF-8?q?7=20Ville=20Skytt=C3=A4=20=20-=20Wo?= =?UTF-8?q?rk=20around=20#250990=20in=20rpmls=20and=20rpmdev-extract.=20-?= =?UTF-8?q?=20Clarify=20copyright=20info=20of=20rpmdev-*=20and=20rpmls.=20?= =?UTF-8?q?Sat=20Jul=207=202007=20Ville=20Skytt=C3=A4=20=20-=20Fix=20Epoch=20handling=20in=20the=202-arg=20fo?= =?UTF-8?q?rm=20of=20rpmdev-vercmp=20with=20yum=20<=203.1.2.=20-=20The=20l?= =?UTF-8?q?ong=20form=20of=20the=20list=20option=20in=20rmdevelrpms=20is?= =?UTF-8?q?=20--list-only,=20not=20=20=20=20=20--list.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 16 ++++++++++++++-- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b858574..13c425e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-6.0.tar.bz2 spectool-1.0.9.tar.bz2 +rpmdevtools-6.1.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 1e2595d..e6370fb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,12 +3,13 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 6.0 +Version: 6.1 Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools -License: GPL +# rpmdev-setuptree is GPLv2, everything else GPLv2+ +License: GPLv2+ and GPLv2 URL: http://fedoraproject.org/ Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 @@ -110,6 +111,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 10 2007 Ville Skyttä - 6.1-1 +- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +* Mon Aug 6 2007 Ville Skyttä +- Work around #250990 in rpmls and rpmdev-extract. +- Clarify copyright info of rpmdev-* and rpmls. + +* Sat Jul 7 2007 Ville Skyttä +- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2. +- The long form of the list option in rmdevelrpms is --list-only, not --list. + * Thu Jul 5 2007 Ville Skyttä - 6.0-1 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. - Drop explicit dependency on patch, pulled in by recent rpm-build. diff --git a/sources b/sources index f67da29..5c7ff48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7582b4f7c8ab6121b57ae2807a40c6ec rpmdevtools-6.0.tar.bz2 b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 +3d5e2747d1955bb902127b4d9ded30a0 rpmdevtools-6.1.tar.bz2 From 5b303311c6f7280b89a334e1f08b2fabde68cdba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 25 Sep 2007 18:19:13 +0000 Subject: [PATCH 004/107] =?UTF-8?q?-=20Sync=20deps=20with=20Fedora's=20new?= =?UTF-8?q?=20"assumed=20present=20in=20buildroots"=20packages=20=20=20=20?= =?UTF-8?q?=20list.=20Thu=20Sep=206=202007=20Ville=20Skytt=C3=A4=20=20-=20Init=20script=20template=20cleanups?= =?UTF-8?q?.=20Tue=20Aug=2028=202007=20Ville=20Skytt=C3=A4=20=20-=20Update=20rpminfo=20to=20version=202004-07?= =?UTF-8?q?-07-02.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 53 +++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 13c425e..c51463d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.9.tar.bz2 -rpmdevtools-6.1.tar.bz2 +rpmdevtools-6.2.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e6370fb..936616e 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 6.1 +Version: 6.2 Release: 1%{?dist} Summary: RPM Development Tools @@ -18,26 +18,38 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Provides: spectool = %{spectool_version} Obsoletes: fedora-rpmdevtools < 5.0 -# Required for tool operations -Requires: rpm-python -Requires: python -Requires: cpio -Requires: sed -Requires: perl -Requires: wget -Requires: file -Requires: fakeroot # Minimal RPM build requirements -Requires: rpm-build >= 4.4.2.1 +Requires: bash +Requires: bzip2 +Requires: coreutils +Requires: cpio +Requires: diffutils +Requires: findutils +Requires: gawk Requires: gcc Requires: gcc-c++ -Requires: redhat-rpm-config -Requires: make -Requires: tar -Requires: diffutils +Requires: grep Requires: gzip -Requires: bzip2 +Requires: info +Requires: make +Requires: patch +Requires: redhat-release +Requires: redhat-rpm-config +Requires: rpm-build >= 4.4.2.1 +Requires: sed +Requires: tar Requires: unzip +Requires: util-linux +Requires: which +# Additionally required for tool operations +#Requires: cpio +Requires: fakeroot +Requires: file +Requires: perl +Requires: python +Requires: rpm-python +#Requires: sed +Requires: wget %description This package contains scripts and (X)Emacs support files to aid in @@ -111,6 +123,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 8 2007 Ville Skyttä - 6.2-1 +- Sync deps with Fedora's new "assumed present in buildroots" packages list. + +* Thu Sep 6 2007 Ville Skyttä +- Init script template cleanups. + +* Tue Aug 28 2007 Ville Skyttä +- Update rpminfo to version 2004-07-07-02. + * Fri Aug 10 2007 Ville Skyttä - 6.1-1 - Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt diff --git a/sources b/sources index 5c7ff48..c23b2f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 -3d5e2747d1955bb902127b4d9ded30a0 rpmdevtools-6.1.tar.bz2 +89bc0d3b1012c9fc3bd8602ff15d033d rpmdevtools-6.2.tar.bz2 From 0f122f194ae1b968bd31b5d1751728726c509cfc Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 12 Oct 2007 14:55:57 +0000 Subject: [PATCH 005/107] - Fix paths in qa-robot tools --- .cvsignore | 2 +- rpmdevtools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c51463d..6aa0e8a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.9.tar.bz2 -rpmdevtools-6.2.tar.bz2 +rpmdevtools-6.3.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 936616e..ddd747c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 6.2 +Version: 6.3 Release: 1%{?dist} Summary: RPM Development Tools @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 +- Fix paths in qa-robot tools + * Sat Sep 8 2007 Ville Skyttä - 6.2-1 - Sync deps with Fedora's new "assumed present in buildroots" packages list. diff --git a/sources b/sources index c23b2f7..a25b20d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 -89bc0d3b1012c9fc3bd8602ff15d033d rpmdevtools-6.2.tar.bz2 +120215963d96a4200c75542f788d6ed5 rpmdevtools-6.3.tar.bz2 From 02ebcf87921fb4e6e2df541f7d201354313780bd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 12 Oct 2007 18:54:20 +0000 Subject: [PATCH 006/107] - Import the previous fix into CVS to resync, bump version --- .cvsignore | 2 +- rpmdevtools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6aa0e8a..526bb61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.9.tar.bz2 -rpmdevtools-6.3.tar.bz2 +rpmdevtools-6.4.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ddd747c..e0c632b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 6.3 +Version: 6.4 Release: 1%{?dist} Summary: RPM Development Tools @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 12 2007 Lubomir Kundrak - 6.4-1 +- Import the previous fix into CVS to resync, bump version + * Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 - Fix paths in qa-robot tools diff --git a/sources b/sources index a25b20d..94bcc61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 -120215963d96a4200c75542f788d6ed5 rpmdevtools-6.3.tar.bz2 +52c257170fb8de032196f04859bdee2c rpmdevtools-6.4.tar.bz2 From da44d80ec48b96ce74c7c148d924337450042e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 26 Mar 2008 21:32:52 +0000 Subject: [PATCH 007/107] =?UTF-8?q?-=206.5.=20Sun=20Mar=2023=202008=20Vill?= =?UTF-8?q?e=20Skytt=C3=A4=20=20-=20Generate?= =?UTF-8?q?=20man=20pages=20at=20build=20time.=20Sat=20Mar=2022=202008=20V?= =?UTF-8?q?ille=20Skytt=C3=A4=20=20-=20Remove?= =?UTF-8?q?=20libgcj-devel=20and=20zlib-devel=20from=20rmdevelrpms'=20inte?= =?UTF-8?q?rnal=20exclusion=20=20=20=20=20list,=20they're=20not=20essentia?= =?UTF-8?q?l=20on=20non-devel=20systems=20any=20more.=20Mon=20Mar=2017=202?= =?UTF-8?q?008=20Ville=20Skytt=C3=A4=20=20-=20?= =?UTF-8?q?Include=20ocaml=20spec=20template.=20Tue=20Mar=2011=202008=20Vi?= =?UTF-8?q?lle=20Skytt=C3=A4=20=20-=20Include?= =?UTF-8?q?=20Michael=20Schwendt's=20bumpspecfile.py=20(as=20rpmdev-bumpsp?= =?UTF-8?q?ec).=20Tue=20Feb=2012=202008=20Ville=20Skytt=C3=A4=20=20-=20Sync=20with=20qa-robot=20upstream.=20-?= =?UTF-8?q?=20Update=20spectool=20to=201.0.10.=20Sun=20Feb=203=202008=20Vi?= =?UTF-8?q?lle=20Skytt=C3=A4=20=20-=20Add=20su?= =?UTF-8?q?pport=20for=207-zip,=20lzma=20and=20lzo=20in=20rpmdev-extract.?= =?UTF-8?q?=20Fri=20Feb=201=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20';;'=20to=20the=20init=20script=20t?= =?UTF-8?q?emplate's=20reload=20action.=20Sat=20Dec=208=202007=20Ville=20S?= =?UTF-8?q?kytt=C3=A4=20=20-=20Add=20fonts=20s?= =?UTF-8?q?pec=20template=20from=20the=20Fedora=20Fonts=20SIG=20(#407781).?= =?UTF-8?q?=20-=20Add=20option=20to=20use=20macro=20style=20instead=20of?= =?UTF-8?q?=20shell=20style=20variables=20to=20=20=20=20=20newspec.=20-=20?= =?UTF-8?q?Prefer=20~/.config/rpmdevtools/rmdevelrpms.conf=20over=20~/.rmd?= =?UTF-8?q?evelrpmsrc=20in=20=20=20=20=20rmdevelrpms.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 ++-- rpmdevtools.spec | 43 +++++++++++++++++++++++++++++++++++++++---- sources | 4 ++-- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 526bb61..43fc5e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -spectool-1.0.9.tar.bz2 -rpmdevtools-6.4.tar.bz2 +rpmdevtools-6.5.tar.bz2 +spectool-1.0.10.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e0c632b..245b851 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,21 +1,23 @@ %define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define spectool_version 1.0.9 +%define spectool_version 1.0.10 Name: rpmdevtools -Version: 6.4 +Version: 6.5 Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 -URL: http://fedoraproject.org/ -Source0: %{name}-%{version}.tar.bz2 +URL: https://fedorahosted.org/rpmdevtools/ +Source0: http://scop.fedorapeople.org/rpmdevtools/%{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: help2man +BuildRequires: %{_bindir}/pod2man Provides: spectool = %{spectool_version} Obsoletes: fedora-rpmdevtools < 5.0 # Minimal RPM build requirements @@ -65,6 +67,7 @@ rpmdev-vercmp RPM version comparison checker 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 ...and many more. @@ -123,6 +126,38 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 26 2008 Ville Skyttä - 6.5-1 +- 6.5. + +* Sun Mar 23 2008 Ville Skyttä +- Generate man pages at build time. + +* Sat Mar 22 2008 Ville Skyttä +- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion + list, they're not essential on non-devel systems any more. + +* Mon Mar 17 2008 Ville Skyttä +- Include ocaml spec template. + +* Tue Mar 11 2008 Ville Skyttä +- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec). + +* Tue Feb 12 2008 Ville Skyttä +- Sync with qa-robot upstream. +- Update spectool to 1.0.10. + +* Sun Feb 3 2008 Ville Skyttä +- Add support for 7-zip, lzma and lzo in rpmdev-extract. + +* Fri Feb 1 2008 Ville Skyttä +- Add ';;' to the init script template's reload action. + +* Sat Dec 8 2007 Ville Skyttä +- Add fonts spec template from the Fedora Fonts SIG (#407781). +- Add option to use macro style instead of shell style variables to newspec. +- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in + rmdevelrpms. + * Fri Oct 12 2007 Lubomir Kundrak - 6.4-1 - Import the previous fix into CVS to resync, bump version diff --git a/sources b/sources index 94bcc61..0896494 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 -52c257170fb8de032196f04859bdee2c rpmdevtools-6.4.tar.bz2 +314c9ecaa1f3e8113e54d2d0c64be237 rpmdevtools-6.5.tar.bz2 +d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 From e78960a8e5a047c4eeac2c8cb8e083cbc0b5da70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 26 Mar 2008 22:40:31 +0000 Subject: [PATCH 008/107] - Fix man page generation. --- .cvsignore | 2 +- rpmdevtools.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 43fc5e0..895857e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-6.5.tar.bz2 spectool-1.0.10.tar.bz2 +rpmdevtools-6.6.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 245b851..af63387 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.10 Name: rpmdevtools -Version: 6.5 +Version: 6.6 Release: 1%{?dist} Summary: RPM Development Tools @@ -16,8 +16,11 @@ Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_v BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# All build deps for man page generation BuildRequires: help2man BuildRequires: %{_bindir}/pod2man +BuildRequires: python +BuildRequires: rpm-python Provides: spectool = %{spectool_version} Obsoletes: fedora-rpmdevtools < 5.0 # Minimal RPM build requirements @@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2008 Ville Skyttä - 6.6-1 +- Fix man page generation. + * Wed Mar 26 2008 Ville Skyttä - 6.5-1 - 6.5. diff --git a/sources b/sources index 0896494..8fc11ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -314c9ecaa1f3e8113e54d2d0c64be237 rpmdevtools-6.5.tar.bz2 d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 +7bcf7bdb6071b4f19c86435e667ca3e4 rpmdevtools-6.6.tar.bz2 From 608037954dfb5a401fb8cf867a3ef5c5f55e2b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 3 Aug 2008 10:03:10 +0000 Subject: [PATCH 009/107] =?UTF-8?q?-=206.7.=20-=20Make=20rpmdev-diff,=20rp?= =?UTF-8?q?mdev-md5=20and=20rpminfo=20honor=20TMPDIR.=20Sat=20Apr=2026=202?= =?UTF-8?q?008=20Ville=20Skytt=C3=A4=20=20-=20?= =?UTF-8?q?Make=20rpmls=20work=20with=20URLs.=20Sun=20Apr=2020=202008=20Vi?= =?UTF-8?q?lle=20Skytt=C3=A4=20=20-=20Include?= =?UTF-8?q?=20rpm=20arch=20in=20dir=20names=20created=20by=20rpmdev-extrac?= =?UTF-8?q?t=20(#443266).=20Fri=20Apr=2018=202008=20Ville=20Skytt=C3=A4=20?= =?UTF-8?q?=20-=20Remove=20duplicate=20"reload?= =?UTF-8?q?"=20from=20case=20block=20in=20init=20script=20template.=20-=20?= =?UTF-8?q?Fix=20exit=20status=20of=20"reload"=20in=20case=20service=20is?= =?UTF-8?q?=20not=20running=20in=20init=20script=20=20=20=20=20template=20?= =?UTF-8?q?(#442993).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 895857e..6ca1d80 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-6.6.tar.bz2 +rpmdevtools-6.7.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index af63387..752a91c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.10 Name: rpmdevtools -Version: 6.6 +Version: 6.7 Release: 1%{?dist} Summary: RPM Development Tools @@ -129,6 +129,21 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 3 2008 Ville Skyttä - 6.7-1 +- 6.7. +- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. + +* Sat Apr 26 2008 Ville Skyttä +- Make rpmls work with URLs. + +* Sun Apr 20 2008 Ville Skyttä +- Include rpm arch in dir names created by rpmdev-extract (#443266). + +* Fri Apr 18 2008 Ville Skyttä +- Remove duplicate "reload" from case block in init script template. +- Fix exit status of "reload" in case service is not running in init + script template (#442993). + * Thu Mar 27 2008 Ville Skyttä - 6.6-1 - Fix man page generation. diff --git a/sources b/sources index 8fc11ee..646f6dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -7bcf7bdb6071b4f19c86435e667ca3e4 rpmdevtools-6.6.tar.bz2 +819ece90d6be10c4ed85cc4a6975589c rpmdevtools-6.7.tar.bz2 From 9001d0f9505030386dd9eb304d6ce7c5ac81b021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 26 Dec 2008 10:57:15 +0000 Subject: [PATCH 010/107] =?UTF-8?q?-=207.0.=20-=20Drop=20fonts=20spec=20te?= =?UTF-8?q?mplate,=20adapt=20to=20new=20ones=20from=20Fedora=20fonts=20SIG?= =?UTF-8?q?=20=20=20=20=20(#477055).=20-=20Add=20man=20page=20for=20rpmdev?= =?UTF-8?q?-newspec.=20Tue=20Dec=2016=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20imake=20and=20intltool=20to?= =?UTF-8?q?=20internal=20list=20of=20devel=20packages=20in=20rmdevelrpms.?= =?UTF-8?q?=20Sat=20Dec=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-sha*/*sum=20companions=20to?= =?UTF-8?q?=20rpmdev-md5=20(ticket=20#7).=20Wed=20Nov=2026=202008=20Ville?= =?UTF-8?q?=20Skytt=C3=A4=20=20-=20Add=20vamp-?= =?UTF-8?q?plugin-sdk=20to=20internal=20list=20of=20non-devel=20packages?= =?UTF-8?q?=20in=20rmdevelrpms=20=20=20=20=20(#472641,=20Michael=20Schwend?= =?UTF-8?q?t).=20Thu=20Nov=2020=202008=20Ville=20Skytt=C3=A4=20=20-=20Drop=20"minimal=20buildroot"=20dependen?= =?UTF-8?q?cies.=20-=20Drop=20fedora-rpmdevtools=20Obsoletes.=20Mon=20Oct?= =?UTF-8?q?=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Show=20available=20types=20in=20rpmdev-newspec=20--hel?= =?UTF-8?q?p=20(ticket=20#6,=20Todd=20=20=20=20=20Zullinger).=20Fri=20Sep?= =?UTF-8?q?=2026=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20-r/--rightmost=20option=20to=20rpmdev-bumpspec?= =?UTF-8?q?=20(ticket=20#1,=20Thorsten=20=20=20=20=20Leemhuis).=20-=20Add?= =?UTF-8?q?=20%packager=20from=20rpm=20config=20to=20the=20set=20of=20defa?= =?UTF-8?q?ults=20for=20=20=20=20=20rpmdev-bumpspec's=20user=20string.=20T?= =?UTF-8?q?hu=20Sep=2025=202008=20Ville=20Skytt=C3=A4=20=20-=20Bring=20rpmdev-bumpspec=20copyright=20holder?= =?UTF-8?q?=20closer=20to=20truth=20(Michael=20=20=20=20=20Schwendt).=20Mo?= =?UTF-8?q?n=20Sep=2022=202008=20Ville=20Skytt=C3=A4=20=20-=20Switch=20to=20lzma=20compressed=20tarball.=20S?= =?UTF-8?q?un=20Sep=207=202008=20Ville=20Skytt=C3=A4=20=20-=20Improve=20arch=20specific=20%files=20in=20perl?= =?UTF-8?q?=20spec=20template=20(#461177,=20Chris=20Weyl).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 79 ++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ca1d80..a85bf89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-6.7.tar.bz2 +rpmdevtools-7.0.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 752a91c..81f53ad 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.10 Name: rpmdevtools -Version: 6.7 +Version: 7.0 Release: 1%{?dist} Summary: RPM Development Tools @@ -11,49 +11,28 @@ Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ -Source0: http://scop.fedorapeople.org/rpmdevtools/%{name}-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# All build deps for man page generation +# lzma for unpacking the tarball +BuildRequires: lzma +# help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: python BuildRequires: rpm-python Provides: spectool = %{spectool_version} -Obsoletes: fedora-rpmdevtools < 5.0 -# Minimal RPM build requirements -Requires: bash -Requires: bzip2 -Requires: coreutils -Requires: cpio Requires: diffutils -Requires: findutils -Requires: gawk -Requires: gcc -Requires: gcc-c++ -Requires: grep -Requires: gzip -Requires: info -Requires: make -Requires: patch -Requires: redhat-release -Requires: redhat-rpm-config -Requires: rpm-build >= 4.4.2.1 -Requires: sed -Requires: tar -Requires: unzip -Requires: util-linux -Requires: which -# Additionally required for tool operations -#Requires: cpio Requires: fakeroot Requires: file -Requires: perl -Requires: python +Requires: findutils +Requires: gawk +Requires: grep +Requires: rpm-build >= 4.4.2.1 Requires: rpm-python -#Requires: sed +Requires: sed Requires: wget %description @@ -65,7 +44,7 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs rpmdev-checksig Check package signatures using alternate RPM keyring rpminfo Print information about executables and libraries -rpmdev-md5 Display the md5sum of all files in an RPM +rpmdev-md5/sha* Display checksums of all files in an RPM package file rpmdev-vercmp RPM version comparison checker spectool Expand and download sources and patches in specfiles rpmdev-wipetree Erase all files within dirs created by rpmdev-setuptree @@ -129,6 +108,42 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 26 2008 Ville Skyttä - 7.0-1 +- 7.0. +- Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055). +- Add man page for rpmdev-newspec. + +* Tue Dec 16 2008 Ville Skyttä +- Add imake and intltool to internal list of devel packages in rmdevelrpms. + +* Sat Dec 13 2008 Ville Skyttä +- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). + +* Wed Nov 26 2008 Ville Skyttä +- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms + (#472641, Michael Schwendt). + +* Thu Nov 20 2008 Ville Skyttä +- Drop "minimal buildroot" dependencies. +- Drop fedora-rpmdevtools Obsoletes. + +* Mon Oct 13 2008 Ville Skyttä +- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). + +* Fri Sep 26 2008 Ville Skyttä +- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). +- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's + user string. + +* Thu Sep 25 2008 Ville Skyttä +- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). + +* Mon Sep 22 2008 Ville Skyttä +- Switch to lzma compressed tarball. + +* Sun Sep 7 2008 Ville Skyttä +- Improve arch specific %%files in perl spec template (#461177, Chris Weyl). + * Sun Aug 3 2008 Ville Skyttä - 6.7-1 - 6.7. - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. diff --git a/sources b/sources index 646f6dc..548cc8e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -819ece90d6be10c4ed85cc4a6975589c rpmdevtools-6.7.tar.bz2 +ccdff99d03845ab8ea294a702b5f6681 rpmdevtools-7.0.tar.lzma From 6e433fb434f64835fb6f16a9badde6489c983112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 1 Jan 2009 18:32:15 +0000 Subject: [PATCH 011/107] - Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen). --- rpmdevtools-5.3-el53-conflict.patch | 12 ++++++++++++ rpmdevtools.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rpmdevtools-5.3-el53-conflict.patch diff --git a/rpmdevtools-5.3-el53-conflict.patch b/rpmdevtools-5.3-el53-conflict.patch new file mode 100644 index 0000000..78023e2 --- /dev/null +++ b/rpmdevtools-5.3-el53-conflict.patch @@ -0,0 +1,12 @@ +diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker +--- rpmdevtools-5.3/check-rpaths-worker~ 2006-08-16 01:28:09.000000000 +0300 ++++ rpmdevtools-5.3/check-rpaths-worker 2009-01-01 20:23:06.000000000 +0200 +@@ -63,8 +63,6 @@ function showHint() + * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like + * \$ RPM_BUILD_ROOT= /usr/lib/rpm/check-rpaths + * +-* 'check-rpaths' is part of 'rpmdevtools'. +-* + ******************************************************************************* + EOF + } diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a76e961..e2345c6 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -12,6 +12,8 @@ License: GPL URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 +# Avoid conflict with EL 5.3 rpm, #466939 +Patch0: %{name}-5.3-el53-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -42,6 +44,7 @@ rpmdev-extract Extract various archives, "tar xvf" style %prep %setup -q -a 1 +%patch0 -p1 cp -p spectool*/README README.spectool @@ -120,6 +123,9 @@ fi %changelog +* Thu Jan 1 2009 Ville Skyttä - 5.3-2 +- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen). + * Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. From a4a99af82180d26f9c970f6f94e3f568090d2023 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 20:29:35 +0000 Subject: [PATCH 012/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 81f53ad..f879c4a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Dec 26 2008 Ville Skyttä - 7.0-1 - 7.0. - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055). From e2cb50bbd3ddc014b54fab4bd5c51abe4b69240d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 4 Apr 2009 11:19:52 +0000 Subject: [PATCH 013/107] =?UTF-8?q?-=206.8.=20Sun=20Feb=2022=202009=20Vill?= =?UTF-8?q?e=20Skytt=C3=A4=20=20-=20Use=20%%gl?= =?UTF-8?q?obal=20instead=20of=20%%define=20in=20spec=20templates.=20-=20H?= =?UTF-8?q?andle=20%%global=20in=20addition=20to=20%%define=20in=20rpmdev-?= =?UTF-8?q?bumpspec.=20Mon=20Jan=2026=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20result=20dependent=20exit?= =?UTF-8?q?=20statuses=20to=20rpmdev-vercmp.=20Fri=20Dec=2026=202008=20Vil?= =?UTF-8?q?le=20Skytt=C3=A4=20=20-=20Add=20min?= =?UTF-8?q?imum=20version=20to=20rpm-python=20dependency=20(for=20rpmdev-b?= =?UTF-8?q?umpspec).=20-=20Add=20man=20page=20for=20rpmdev-newspec.=20Tue?= =?UTF-8?q?=20Dec=2016=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20imake=20and=20intltool=20to=20internal?= =?UTF-8?q?=20list=20of=20devel=20packages=20in=20rmdevelrpms.=20Sat=20Dec?= =?UTF-8?q?=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-sha*/*sum=20companions=20to=20rpmdev-md5?= =?UTF-8?q?=20(ticket=20#7).=20Wed=20Nov=2026=202008=20Ville=20Skytt=C3=A4?= =?UTF-8?q?=20=20-=20Add=20vamp-plugin-sdk=20t?= =?UTF-8?q?o=20internal=20list=20of=20non-devel=20packages=20in=20rmdevelr?= =?UTF-8?q?pms=20=20=20=20=20(#472641,=20Michael=20Schwendt).=20Mon=20Oct?= =?UTF-8?q?=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Show=20available=20types=20in=20rpmdev-newspec=20--hel?= =?UTF-8?q?p=20(ticket=20#6,=20Todd=20=20=20=20=20Zullinger).=20Fri=20Sep?= =?UTF-8?q?=2026=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20-r/--rightmost=20option=20to=20rpmdev-bumpspec?= =?UTF-8?q?=20(ticket=20#1,=20Thorsten=20=20=20=20=20Leemhuis).=20-=20Add?= =?UTF-8?q?=20%%packager=20from=20rpm=20config=20to=20the=20set=20of=20def?= =?UTF-8?q?aults=20for=20=20=20=20=20rpmdev-bumpspec's=20user=20string.=20?= =?UTF-8?q?Thu=20Sep=2025=202008=20Ville=20Skytt=C3=A4=20=20-=20Bring=20rpmdev-bumpspec=20copyright=20holder?= =?UTF-8?q?=20closer=20to=20truth=20(Michael=20=20=20=20=20Schwendt).=20Su?= =?UTF-8?q?n=20Sep=207=202008=20Ville=20Skytt=C3=A4=20=20-=20Improve=20arch=20specific=20%%files=20in=20per?= =?UTF-8?q?l=20spec=20template=20(#461177,=20Chris=20=20=20=20=20Weyl).=20?= =?UTF-8?q?Sun=20Aug=203=202008=20Ville=20Skytt=C3=A4=20=20-=206.7-1=20-=206.7.=20-=20Make=20rpmdev-diff,=20r?= =?UTF-8?q?pmdev-md5=20and=20rpminfo=20honor=20TMPDIR.=20Sat=20Apr=2026=20?= =?UTF-8?q?2008=20Ville=20Skytt=C3=A4=20=20-?= =?UTF-8?q?=20Make=20rpmls=20work=20with=20URLs.=20Sun=20Apr=2020=202008?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=20Inc?= =?UTF-8?q?lude=20rpm=20arch=20in=20dir=20names=20created=20by=20rpmdev-ex?= =?UTF-8?q?tract=20(#443266).=20Fri=20Apr=2018=202008=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=20Remove=20duplicate?= =?UTF-8?q?=20"reload"=20from=20case=20block=20in=20init=20script=20templa?= =?UTF-8?q?te.=20-=20Fix=20exit=20status=20of=20"reload"=20in=20case=20ser?= =?UTF-8?q?vice=20is=20not=20running=20in=20init=20script=20=20=20=20=20te?= =?UTF-8?q?mplate=20(#442993).=20Thu=20Mar=2027=202008=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=206.6-1=20-=20Fix=20m?= =?UTF-8?q?an=20page=20generation.=20Wed=20Mar=2026=202008=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=206.5-1=20-=206.5.=20?= =?UTF-8?q?Sun=20Mar=2023=202008=20Ville=20Skytt=C3=A4=20=20-=20Generate=20man=20pages=20at=20build=20time.?= =?UTF-8?q?=20Sat=20Mar=2022=202008=20Ville=20Skytt=C3=A4=20=20-=20Remove=20libgcj-devel=20and=20zlib-devel?= =?UTF-8?q?=20from=20rmdevelrpms'=20internal=20exclusion=20=20=20=20=20lis?= =?UTF-8?q?t,=20they're=20not=20essential=20on=20non-devel=20systems=20any?= =?UTF-8?q?=20more.=20Mon=20Mar=2017=202008=20Ville=20Skytt=C3=A4=20=20-=20Include=20ocaml=20spec=20template.?= =?UTF-8?q?=20Tue=20Mar=2011=202008=20Ville=20Skytt=C3=A4=20=20-=20Include=20Michael=20Schwendt's=20bumpspec?= =?UTF-8?q?file.py=20(as=20rpmdev-bumpspec).=20Tue=20Feb=2012=202008=20Vil?= =?UTF-8?q?le=20Skytt=C3=A4=20=20-=20Sync=20wi?= =?UTF-8?q?th=20qa-robot=20upstream.=20-=20Update=20spectool=20to=201.0.10?= =?UTF-8?q?.=20Sun=20Feb=203=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20support=20for=207-zip,=20lzma=20and?= =?UTF-8?q?=20lzo=20in=20rpmdev-extract.=20Fri=20Feb=201=202008=20Ville=20?= =?UTF-8?q?Skytt=C3=A4=20=20-=20Add=20';;'=20t?= =?UTF-8?q?o=20the=20init=20script=20template's=20reload=20action.=20Sat?= =?UTF-8?q?=20Dec=208=202007=20Ville=20Skytt=C3=A4=20=20-=20Add=20option=20to=20use=20macro=20style=20instead?= =?UTF-8?q?=20of=20shell=20style=20variables=20to=20=20=20=20=20newspec.?= =?UTF-8?q?=20-=20Prefer=20~/.config/rpmdevtools/rmdevelrpms.conf=20over?= =?UTF-8?q?=20~/.rmdevelrpmsrc=20in=20=20=20=20=20rmdevelrpms.=20Fri=20Oct?= =?UTF-8?q?=2012=202007=20Lubomir=20Kundrak=20=20-=20?= =?UTF-8?q?6.4-1=20-=20Import=20the=20previous=20fix=20into=20CVS=20to=20r?= =?UTF-8?q?esync,=20bump=20version=20Fri=20Oct=2012=202007=20Lubomir=20Kun?= =?UTF-8?q?drak=20=20-=206.3-1=20-=20Fix=20paths=20in?= =?UTF-8?q?=20qa-robot=20tools=20Sat=20Sep=208=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=206.2-1=20-=20Sync=20?= =?UTF-8?q?deps=20with=20Fedora's=20new=20"assumed=20present=20in=20buildr?= =?UTF-8?q?oots"=20packages=20=20=20=20=20list.=20Thu=20Sep=206=202007=20V?= =?UTF-8?q?ille=20Skytt=C3=A4=20=20-=20Init=20?= =?UTF-8?q?script=20template=20cleanups.=20Tue=20Aug=2028=202007=20Ville?= =?UTF-8?q?=20Skytt=C3=A4=20=20-=20Update=20rp?= =?UTF-8?q?minfo=20to=20version=202004-07-07-02.=20Fri=20Aug=2010=202007?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=206.1?= =?UTF-8?q?-1=20-=20Sync=20COPYING=20with=20http://www.gnu.org/licenses/ol?= =?UTF-8?q?d-licenses/gpl-2.0.txt=20Mon=20Aug=206=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=20Work=20around=20#25?= =?UTF-8?q?0990=20in=20rpmls=20and=20rpmdev-extract.=20-=20Clarify=20copyr?= =?UTF-8?q?ight=20info=20of=20rpmdev-*=20and=20rpmls.=20Sat=20Jul=207=2020?= =?UTF-8?q?07=20Ville=20Skytt=C3=A4=20=20-=20F?= =?UTF-8?q?ix=20Epoch=20handling=20in=20the=202-arg=20form=20of=20rpmdev-v?= =?UTF-8?q?ercmp=20with=20yum=20<=203.1.2.=20-=20The=20long=20form=20of=20?= =?UTF-8?q?the=20list=20option=20in=20rmdevelrpms=20is=20--list-only,=20no?= =?UTF-8?q?t=20=20=20=20=20--list.=20Thu=20Jul=205=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=206.0-1=20-=20Remove?= =?UTF-8?q?=20check-{buildroot,rpaths*},=20now=20included=20in=20rpm-build?= =?UTF-8?q?=20>=3D=204.4.2.1.=20-=20Drop=20explicit=20dependency=20on=20pa?= =?UTF-8?q?tch,=20pulled=20in=20by=20recent=20rpm-build.=20-=20Add=20cmake?= =?UTF-8?q?=20and=20scons=20to=20default=20devel=20package=20list=20in=20r?= =?UTF-8?q?pmdev-rmdevelrpms.=20-=20Add=20LSB=20comment=20block=20to=20ini?= =?UTF-8?q?t=20script=20template.=20Wed=20Jun=2027=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=20Add=202-argument=20?= =?UTF-8?q?form=20for=20comparing=20EVR=20strings=20to=20rpmdev-vercmp=20(?= =?UTF-8?q?available=20=20=20=20=20only=20if=20rpmUtils.miscutils=20is=20a?= =?UTF-8?q?vailable).=20Sat=20Jun=2016=202007=20Ville=20Skytt=C3=A4=20=20-=20Include=20rpmsodiff=20and=20depe?= =?UTF-8?q?ndencies=20(rpmargs,=20rpmelfsym,=20rpmfile,=20rpmpeek,=20=20?= =?UTF-8?q?=20=20=20rpmsoname)=20from=20ALT=20Linux's=20qa-robot=20package?= =?UTF-8?q?.=20-=20Include=20rpmls=20(#213778).=20Fri=20Jun=2015=202007=20?= =?UTF-8?q?Ville=20Skytt=C3=A4=20=20-=20Update?= =?UTF-8?q?=20spectool=20to=201.0.9=20(#243731).=20Wed=20Apr=2011=202007?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=20Add?= =?UTF-8?q?=20--list-only=20option=20to=20rmdevelrpms=20(Thorsten=20Leemhu?= =?UTF-8?q?is).=20Tue=20Mar=2013=202007=20Ville=20Skytt=C3=A4=20=20-=20BR=20perl(ExtUtils::MakeMaker)=20by=20?= =?UTF-8?q?default=20in=20perl=20spec=20template.=20-=20Update=20URL.=20We?= =?UTF-8?q?d=20Nov=208=202006=20Ville=20Skytt=C3=A4=20=20-=20Arch-qualify=20output=20of=20matched=20package?= =?UTF-8?q?s=20in=20rmdevelrpms=20and=20allow=20=20=20=20=20arch-qualified?= =?UTF-8?q?=20packages=20in=20the=20config=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 +- rpmdevtools-5.3-el53-conflict.patch | 12 -- rpmdevtools.spec | 217 ++++++++++++++++++++++++---- sources | 4 +- 4 files changed, 196 insertions(+), 41 deletions(-) delete mode 100644 rpmdevtools-5.3-el53-conflict.patch diff --git a/.cvsignore b/.cvsignore index 7076111..5f6a19e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-5.3.tar.bz2 -spectool-1.0.8.tar.bz2 +spectool-1.0.10.tar.bz2 +rpmdevtools-6.8.tar.bz2 diff --git a/rpmdevtools-5.3-el53-conflict.patch b/rpmdevtools-5.3-el53-conflict.patch deleted file mode 100644 index 78023e2..0000000 --- a/rpmdevtools-5.3-el53-conflict.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker ---- rpmdevtools-5.3/check-rpaths-worker~ 2006-08-16 01:28:09.000000000 +0300 -+++ rpmdevtools-5.3/check-rpaths-worker 2009-01-01 20:23:06.000000000 +0200 -@@ -63,8 +63,6 @@ function showHint() - * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like - * \$ RPM_BUILD_ROOT= /usr/lib/rpm/check-rpaths - * --* 'check-rpaths' is part of 'rpmdevtools'. --* - ******************************************************************************* - EOF - } diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e2345c6..b895993 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,30 +1,60 @@ -%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define spectool_version 1.0.8 +%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d +%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%global spectool_version 1.0.10 Name: rpmdevtools -Version: 5.3 -Release: 2%{?dist} +Version: 6.8 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools -License: GPL -URL: http://fedora.redhat.com/ -Source0: %{name}-%{version}.tar.bz2 +# rpmdev-setuptree is GPLv2, everything else GPLv2+ +License: GPLv2+ and GPLv2 +URL: https://fedorahosted.org/rpmdevtools/ +Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 -# Avoid conflict with EL 5.3 rpm, #466939 -Patch0: %{name}-5.3-el53-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# All build deps for man page generation +BuildRequires: help2man +BuildRequires: %{_bindir}/pod2man +BuildRequires: python +BuildRequires: rpm-python Provides: spectool = %{spectool_version} Provides: fedora-rpmdevtools = %{version} Obsoletes: fedora-rpmdevtools < 5.0 -# Required for tool operations -Requires: rpm-python, python, cpio, sed, perl, wget, file # Minimal RPM build requirements -Requires: rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch -Requires: diffutils, gzip, bzip2, unzip +Requires: bash +Requires: bzip2 +Requires: coreutils +Requires: cpio +Requires: diffutils +Requires: findutils +Requires: gawk +Requires: gcc +Requires: gcc-c++ +Requires: grep +Requires: gzip +Requires: info +Requires: make +Requires: redhat-release +Requires: redhat-rpm-config +Requires: rpm-build >= 4.4.2.1 +Requires: sed +Requires: tar +Requires: unzip +Requires: util-linux +Requires: which +# Additionally required for tool operations +#Requires: cpio +Requires: fakeroot +Requires: file +Requires: perl +Requires: python +Requires: rpm-python >= 4.4.2.2 +#Requires: sed +Requires: wget %description This package contains scripts and (X)Emacs support files to aid in @@ -35,16 +65,17 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs rpmdev-checksig Check package signatures using alternate RPM keyring rpminfo Print information about executables and libraries -rpmdev-md5 Display the md5sum of all files in an RPM +rpmdev-md5/sha* Display checksums of all files in an RPM package file rpmdev-vercmp RPM version comparison checker 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 +...and many more. %prep %setup -q -a 1 -%patch0 -p1 cp -p spectool*/README README.spectool @@ -79,10 +110,6 @@ ln -s rpmdev-wipetree $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree ln -s rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo -%check -make check - - %clean rm -rf $RPM_BUILD_ROOT @@ -116,15 +143,155 @@ fi %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_datadir}/rpmdevtools/ -%{_bindir}/* -%{_prefix}/lib/rpm/check-* +%{_bindir}/fedora-* +%{_bindir}/rpm* +%{_bindir}/spectool %ghost %{_datadir}/*emacs -%{_mandir}/man?/*.* +%{_mandir}/man[18]/rpm*.[18]* %changelog -* Thu Jan 1 2009 Ville Skyttä - 5.3-2 -- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen). +* Fri Apr 3 2009 Ville Skyttä - 6.8-1 +- 6.8. + +* Sun Feb 22 2009 Ville Skyttä +- Use %%global instead of %%define in spec templates. +- Handle %%global in addition to %%define in rpmdev-bumpspec. + +* Mon Jan 26 2009 Ville Skyttä +- Add result dependent exit statuses to rpmdev-vercmp. + +* Fri Dec 26 2008 Ville Skyttä +- Add minimum version to rpm-python dependency (for rpmdev-bumpspec). +- Add man page for rpmdev-newspec. + +* Tue Dec 16 2008 Ville Skyttä +- Add imake and intltool to internal list of devel packages in rmdevelrpms. + +* Sat Dec 13 2008 Ville Skyttä +- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). + +* Wed Nov 26 2008 Ville Skyttä +- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms + (#472641, Michael Schwendt). + +* Mon Oct 13 2008 Ville Skyttä +- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). + +* Fri Sep 26 2008 Ville Skyttä +- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). +- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's + user string. + +* Thu Sep 25 2008 Ville Skyttä +- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). + +* Sun Sep 7 2008 Ville Skyttä +- Improve arch specific %%files in perl spec template (#461177, Chris Weyl). + +* Sun Aug 3 2008 Ville Skyttä - 6.7-1 +- 6.7. +- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. + +* Sat Apr 26 2008 Ville Skyttä +- Make rpmls work with URLs. + +* Sun Apr 20 2008 Ville Skyttä +- Include rpm arch in dir names created by rpmdev-extract (#443266). + +* Fri Apr 18 2008 Ville Skyttä +- Remove duplicate "reload" from case block in init script template. +- Fix exit status of "reload" in case service is not running in init + script template (#442993). + +* Thu Mar 27 2008 Ville Skyttä - 6.6-1 +- Fix man page generation. + +* Wed Mar 26 2008 Ville Skyttä - 6.5-1 +- 6.5. + +* Sun Mar 23 2008 Ville Skyttä +- Generate man pages at build time. + +* Sat Mar 22 2008 Ville Skyttä +- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion + list, they're not essential on non-devel systems any more. + +* Mon Mar 17 2008 Ville Skyttä +- Include ocaml spec template. + +* Tue Mar 11 2008 Ville Skyttä +- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec). + +* Tue Feb 12 2008 Ville Skyttä +- Sync with qa-robot upstream. +- Update spectool to 1.0.10. + +* Sun Feb 3 2008 Ville Skyttä +- Add support for 7-zip, lzma and lzo in rpmdev-extract. + +* Fri Feb 1 2008 Ville Skyttä +- Add ';;' to the init script template's reload action. + +* Sat Dec 8 2007 Ville Skyttä +- Add option to use macro style instead of shell style variables to newspec. +- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in + rmdevelrpms. + +* Fri Oct 12 2007 Lubomir Kundrak - 6.4-1 +- Import the previous fix into CVS to resync, bump version + +* Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 +- Fix paths in qa-robot tools + +* Sat Sep 8 2007 Ville Skyttä - 6.2-1 +- Sync deps with Fedora's new "assumed present in buildroots" packages list. + +* Thu Sep 6 2007 Ville Skyttä +- Init script template cleanups. + +* Tue Aug 28 2007 Ville Skyttä +- Update rpminfo to version 2004-07-07-02. + +* Fri Aug 10 2007 Ville Skyttä - 6.1-1 +- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +* Mon Aug 6 2007 Ville Skyttä +- Work around #250990 in rpmls and rpmdev-extract. +- Clarify copyright info of rpmdev-* and rpmls. + +* Sat Jul 7 2007 Ville Skyttä +- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2. +- The long form of the list option in rmdevelrpms is --list-only, not --list. + +* Thu Jul 5 2007 Ville Skyttä - 6.0-1 +- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. +- Drop explicit dependency on patch, pulled in by recent rpm-build. +- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms. +- Add LSB comment block to init script template. + +* Wed Jun 27 2007 Ville Skyttä +- Add 2-argument form for comparing EVR strings to rpmdev-vercmp + (available only if rpmUtils.miscutils is available). + +* Sat Jun 16 2007 Ville Skyttä +- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, + rpmsoname) from ALT Linux's qa-robot package. +- Include rpmls (#213778). + +* Fri Jun 15 2007 Ville Skyttä +- Update spectool to 1.0.9 (#243731). + +* Wed Apr 11 2007 Ville Skyttä +- Add --list-only option to rmdevelrpms (Thorsten Leemhuis). + +* Tue Mar 13 2007 Ville Skyttä +- BR perl(ExtUtils::MakeMaker) by default in perl spec template. +- Update URL. + +* Wed Nov 8 2006 Ville Skyttä +- Arch-qualify output of matched packages in rmdevelrpms and allow + arch-qualified packages in the config file. * Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. diff --git a/sources b/sources index ddfa0e5..68a41fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 -42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 +d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 +32a879de3650642a75e58f61f3b07d8e rpmdevtools-6.8.tar.bz2 From 56e38cc3da1e4a75c4a6688137a71616f7b19d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 4 Apr 2009 11:48:20 +0000 Subject: [PATCH 014/107] =?UTF-8?q?-=207.1.=20-=20Make=20rpmdev-md5=20and?= =?UTF-8?q?=20friends=20work=20on=20non-srpm=20package=20files=20too.=20Su?= =?UTF-8?q?n=20Mar=2015=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20bash=20completion.=20Mon=20Mar=209=20200?= =?UTF-8?q?9=20Ville=20Skytt=C3=A4=20=20-=20Ad?= =?UTF-8?q?d=20query=20format=20option=20to=20rmdevelrpms,=20sort=20output?= =?UTF-8?q?=20by=20NEVRA.=20Sun=20Feb=2022=202009=20Ville=20Skytt=C3=A4=20?= =?UTF-8?q?=20-=20Use=20%%global=20instead=20o?= =?UTF-8?q?f=20%%define=20in=20spec=20templates.=20-=20Handle=20%%global?= =?UTF-8?q?=20in=20addition=20to=20%%define=20in=20rpmdev-bumpspec.=20Mon?= =?UTF-8?q?=20Jan=2026=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20result=20dependent=20exit=20statuses=20t?= =?UTF-8?q?o=20rpmdev-vercmp.=20Fri=20Dec=2026=202008=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=20Add=20minimum=20ver?= =?UTF-8?q?sion=20to=20rpm-python=20dependency=20(for=20rpmdev-bumpspec).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 38 +++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index a85bf89..bb6bc1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.0.tar.lzma +rpmdevtools-7.1.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index f879c4a..8ced60c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,17 +1,17 @@ -%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define spectool_version 1.0.10 +%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d +%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.0 -Release: 2%{?dist} +Version: 7.1 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ -Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma +Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,9 +31,11 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.1 -Requires: rpm-python +Requires: rpm-python >= 4.4.2.2 Requires: sed Requires: wget +# For _get_cword in bash completion snippet +Conflicts: bash-completion < 20080705 %description This package contains scripts and (X)Emacs support files to aid in @@ -100,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ +%{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ %{_bindir}/rpm* %{_bindir}/spectool @@ -108,8 +111,25 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Sat Apr 4 2009 Ville Skyttä - 7.1-1 +- 7.1. +- Make rpmdev-md5 and friends work on non-srpm package files too. + +* Sun Mar 15 2009 Ville Skyttä +- Add bash completion. + +* Mon Mar 9 2009 Ville Skyttä +- Add query format option to rmdevelrpms, sort output by NEVRA. + +* Sun Feb 22 2009 Ville Skyttä +- Use %%global instead of %%define in spec templates. +- Handle %%global in addition to %%define in rpmdev-bumpspec. + +* Mon Jan 26 2009 Ville Skyttä +- Add result dependent exit statuses to rpmdev-vercmp. + +* Fri Dec 26 2008 Ville Skyttä +- Add minimum version to rpm-python dependency (for rpmdev-bumpspec). * Fri Dec 26 2008 Ville Skyttä - 7.0-1 - 7.0. diff --git a/sources b/sources index 548cc8e..8dc3617 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -ccdff99d03845ab8ea294a702b5f6681 rpmdevtools-7.0.tar.lzma +0d0e9fa78d3f5cfe09c25cf69d629ba2 rpmdevtools-7.1.tar.lzma From 9a552d4934fc5e578293fd6e1e4ea96bedb02aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 21 May 2009 14:48:30 +0000 Subject: [PATCH 015/107] =?UTF-8?q?-=20Release=207.2.=20Sun=20May=203=2020?= =?UTF-8?q?09=20Ville=20Skytt=C3=A4=20=20-=20A?= =?UTF-8?q?dd=20dummy=20spec=20template=20for=20ad-hoc=20testing.=20Sat=20?= =?UTF-8?q?May=202=202009=20Ville=20Skytt=C3=A4=20=20-=20Improve=20newspec/newinit=20when=20only=20"-o=20foo"?= =?UTF-8?q?=20argument=20is=20given=20(#498588,=20=20=20=20=20thanks=20to?= =?UTF-8?q?=20Edwin=20ten=20Brink).=20-=20Try=20to=20get=20packager=20mail?= =?UTF-8?q?=20address=20for=20*Emacs=20rpm-spec-mode=20from=20=20=20=20=20?= =?UTF-8?q?~/.fedora.cert=20if=20rpm-spec-user-mail-address=20is=20not=20s?= =?UTF-8?q?et.=20-=20Add=20xz=20support=20to=20rpmdev-extract.=20Sat=20Apr?= =?UTF-8?q?=2018=202009=20Ville=20Skytt=C3=A4=20=20-=20Make=20bumpspec's=20use=20of=20"head"=20POSIX=20compli?= =?UTF-8?q?ant.=20Thu=20Apr=2016=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-newinit=20for=20easier=20?= =?UTF-8?q?access=20to=20the=20init=20script=20template,=20move=20=20=20?= =?UTF-8?q?=20=20the=20template=20to=20%{=5Fsysconfdir}/rpmdevtools,=20imp?= =?UTF-8?q?rove=20reload=20action=20=20=20=20=20example.=20Tue=20Apr=207?= =?UTF-8?q?=202009=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Speed=20up=20rpmls=20bash=20completion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 25 ++++++++++++++++++++++++- sources | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bb6bc1d..45ee3dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.1.tar.lzma +rpmdevtools-7.2.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8ced60c..9d05a03 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.1 +Version: 7.2 Release: 1%{?dist} Summary: RPM Development Tools @@ -111,6 +111,29 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 20 2009 Ville Skyttä - 7.2-1 +- Release 7.2. + +* Sun May 3 2009 Ville Skyttä +- Add dummy spec template for ad-hoc testing. + +* Sat May 2 2009 Ville Skyttä +- Improve newspec/newinit when only "-o foo" argument is given (#498588, + thanks to Edwin ten Brink). +- Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert + if rpm-spec-user-mail-address is not set. +- Add xz support to rpmdev-extract. + +* Sat Apr 18 2009 Ville Skyttä +- Make bumpspec's use of "head" POSIX compliant. + +* Thu Apr 16 2009 Ville Skyttä +- Add rpmdev-newinit for easier access to the init script template, move the + template to %%{_sysconfdir}/rpmdevtools, improve reload action example. + +* Tue Apr 7 2009 Ville Skyttä +- Speed up rpmls bash completion. + * Sat Apr 4 2009 Ville Skyttä - 7.1-1 - 7.1. - Make rpmdev-md5 and friends work on non-srpm package files too. diff --git a/sources b/sources index 8dc3617..c1fa63e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -0d0e9fa78d3f5cfe09c25cf69d629ba2 rpmdevtools-7.1.tar.lzma +a251d4bb5b65fcdabe59e8defc99235b rpmdevtools-7.2.tar.lzma From 61dbb79aedf093ef01f6b39b191a9ee94a722ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 May 2009 21:29:51 +0000 Subject: [PATCH 016/107] =?UTF-8?q?-=20Release=207.3.=20Sat=20May=2023=202?= =?UTF-8?q?009=20Ville=20Skytt=C3=A4=20=20-=20?= =?UTF-8?q?Add=20rpmdev-packager=20-=20script=20for=20getting=20rpm=20pack?= =?UTF-8?q?ager=20info.=20-=20Use=20rpmdev-packager=20in=20rpmdev-bumpspec?= =?UTF-8?q?=20and=20rpmdev-init.el.=20-=20Fix=20rpmdev-extract=20MIME=20ty?= =?UTF-8?q?pe=20comparisons=20with=20file(1)=20output=20containing=20=20?= =?UTF-8?q?=20=20=20parameters.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45ee3dc..593fabd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.2.tar.lzma +rpmdevtools-7.3.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9d05a03..3e03427 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,8 +3,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.2 -Release: 1%{?dist} +Version: 7.3 +Release: 1 Summary: RPM Development Tools Group: Development/Tools @@ -31,7 +31,7 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.1 -Requires: rpm-python >= 4.4.2.2 +Requires: rpm-python Requires: sed Requires: wget # For _get_cword in bash completion snippet @@ -111,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 25 2009 Ville Skyttä - 7.3-1 +- Release 7.3. + +* Sat May 23 2009 Ville Skyttä +- Add rpmdev-packager - script for getting rpm packager info. +- Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el. +- Fix rpmdev-extract MIME type comparisons with file(1) output containing + parameters. + * Wed May 20 2009 Ville Skyttä - 7.2-1 - Release 7.2. diff --git a/sources b/sources index c1fa63e..28defc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -a251d4bb5b65fcdabe59e8defc99235b rpmdevtools-7.2.tar.lzma +5475dc402a40356163e4a9b468f6497b rpmdevtools-7.3.tar.lzma From f1a55044c003f31b4c60037fde817fee5d052bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 May 2009 21:34:15 +0000 Subject: [PATCH 017/107] Doh. --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3e03427..c3e3393 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.3 -Release: 1 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools From 1f405acaf39fd42d76c8954dc664fb7030f4f4e9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 03:13:18 +0000 Subject: [PATCH 018/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index c3e3393..e620ffc 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon May 25 2009 Ville Skyttä - 7.3-1 - Release 7.3. From a33d3a18f25d31640d9510485a8476c5609d74ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 21 Aug 2009 09:58:25 +0000 Subject: [PATCH 019/107] - Update to 7.4, fixes #215927 and #466353. - Patch spectool to make -s and -p to work as documented (Todd Zullinger). --- .cvsignore | 2 +- rpmdevtools.spec | 33 ++++++++++++++++++++------------- sources | 2 +- spectool-1.0.10-sourcenum.patch | 17 +++++++++++++++++ 4 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 spectool-1.0.10-sourcenum.patch diff --git a/.cvsignore b/.cvsignore index 593fabd..2ae134c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.3.tar.lzma +rpmdevtools-7.4.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e620ffc..a85fdde 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,25 +3,24 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.3 -Release: 2%{?dist} +Version: 7.4 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ -Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma +Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 +Patch0: spectool-1.0.10-sourcenum.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# lzma for unpacking the tarball -BuildRequires: lzma # help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man -BuildRequires: python +BuildRequires: python >= 2.4 BuildRequires: rpm-python Provides: spectool = %{spectool_version} Requires: diffutils @@ -30,6 +29,8 @@ Requires: file Requires: findutils Requires: gawk Requires: grep +Requires: man +Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.1 Requires: rpm-python Requires: sed @@ -46,7 +47,7 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs 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 RPM package file +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-wipetree Erase all files within dirs created by rpmdev-setuptree @@ -57,7 +58,10 @@ rpmdev-bumpspec Bump revision in specfile %prep %setup -q -a 1 -cp -p spectool*/README README.spectool +cp -p spectool-%{spectool_version}/README README.spectool +cd spectool-%{spectool_version} +%patch0 -p1 +cd .. %build @@ -70,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir} +install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir} for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do install -dm 755 $RPM_BUILD_ROOT$dir @@ -100,17 +104,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING README* +%doc COPYING NEWS README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ -%{_bindir}/rpm* -%{_bindir}/spectool +%{_bindir}/* %ghost %{_datadir}/*emacs -%{_mandir}/man[18]/rpm*.[18]* +%{_mandir}/man[18]/*.[18]* %changelog +* Fri Aug 21 2009 Ville Skyttä - 7.4-1 +- Update to 7.4, fixes #215927 and #466353. +- Patch spectool to make -s and -p to work as documented (Todd Zullinger). + * Sun Jul 26 2009 Fedora Release Engineering - 7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 28defc9..e11337b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -5475dc402a40356163e4a9b468f6497b rpmdevtools-7.3.tar.lzma +8407f2e7f2037ec28ca7910fed2c3498 rpmdevtools-7.4.tar.xz diff --git a/spectool-1.0.10-sourcenum.patch b/spectool-1.0.10-sourcenum.patch new file mode 100644 index 0000000..c9a0581 --- /dev/null +++ b/spectool-1.0.10-sourcenum.patch @@ -0,0 +1,17 @@ +Fix for -s x,y, -p x,y from Todd Zullinger: +https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html + +diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool +--- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200 ++++ spectool-1.0.10/spectool 2009-08-21 02:12:56.000000000 +0300 +@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command = + 'v|verbose' => sub { $verbose++; }, + 'n|dryrun|dry-run' => sub { $dryrun = 1; }, + 'V|version' => sub { $command = 'version'; }, +- 's|source=i' => \@sources, +- 'p|patch=i' => \@patches, ++ 's|source=s' => \@sources, ++ 'p|patch=s' => \@patches, + 'S|sources' => sub { push @what, 'sources'; }, + 'P|patches' => sub { push @what, 'patches'; }, + 'A|all' => sub { push @what, 'all'; }, From d3f2e953ce362e7d2aa9083e53d522354360771a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Sep 2009 21:09:36 +0000 Subject: [PATCH 020/107] - Update to 7.5, fixes #502403. --- .cvsignore | 2 +- rpmdevtools.spec | 165 ++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 86 insertions(+), 83 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ae134c..d76cb84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.4.tar.xz +rpmdevtools-7.5.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a85fdde..ec80ecf 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.4 +Version: 7.5 Release: 1%{?dist} Summary: RPM Development Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 17 2009 Ville Skyttä - 7.5-1 +- Update to 7.5, fixes #502403. + * Fri Aug 21 2009 Ville Skyttä - 7.4-1 - Update to 7.4, fixes #215927 and #466353. - Patch spectool to make -s and -p to work as documented (Todd Zullinger). @@ -121,139 +124,139 @@ rm -rf $RPM_BUILD_ROOT * Sun Jul 26 2009 Fedora Release Engineering - 7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Mon May 25 2009 Ville Skyttä - 7.3-1 +* Mon May 25 2009 Ville Skyttä - 7.3-1 - Release 7.3. -* Sat May 23 2009 Ville Skyttä +* Sat May 23 2009 Ville Skyttä - Add rpmdev-packager - script for getting rpm packager info. - Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el. - Fix rpmdev-extract MIME type comparisons with file(1) output containing parameters. -* Wed May 20 2009 Ville Skyttä - 7.2-1 +* Wed May 20 2009 Ville Skyttä - 7.2-1 - Release 7.2. -* Sun May 3 2009 Ville Skyttä +* Sun May 3 2009 Ville Skyttä - Add dummy spec template for ad-hoc testing. -* Sat May 2 2009 Ville Skyttä +* Sat May 2 2009 Ville Skyttä - Improve newspec/newinit when only "-o foo" argument is given (#498588, thanks to Edwin ten Brink). - Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert if rpm-spec-user-mail-address is not set. - Add xz support to rpmdev-extract. -* Sat Apr 18 2009 Ville Skyttä +* Sat Apr 18 2009 Ville Skyttä - Make bumpspec's use of "head" POSIX compliant. -* Thu Apr 16 2009 Ville Skyttä +* Thu Apr 16 2009 Ville Skyttä - Add rpmdev-newinit for easier access to the init script template, move the template to %%{_sysconfdir}/rpmdevtools, improve reload action example. -* Tue Apr 7 2009 Ville Skyttä +* Tue Apr 7 2009 Ville Skyttä - Speed up rpmls bash completion. -* Sat Apr 4 2009 Ville Skyttä - 7.1-1 +* Sat Apr 4 2009 Ville Skyttä - 7.1-1 - 7.1. - Make rpmdev-md5 and friends work on non-srpm package files too. -* Sun Mar 15 2009 Ville Skyttä +* Sun Mar 15 2009 Ville Skyttä - Add bash completion. -* Mon Mar 9 2009 Ville Skyttä +* Mon Mar 9 2009 Ville Skyttä - Add query format option to rmdevelrpms, sort output by NEVRA. -* Sun Feb 22 2009 Ville Skyttä +* Sun Feb 22 2009 Ville Skyttä - Use %%global instead of %%define in spec templates. - Handle %%global in addition to %%define in rpmdev-bumpspec. -* Mon Jan 26 2009 Ville Skyttä +* Mon Jan 26 2009 Ville Skyttä - Add result dependent exit statuses to rpmdev-vercmp. -* Fri Dec 26 2008 Ville Skyttä +* Fri Dec 26 2008 Ville Skyttä - Add minimum version to rpm-python dependency (for rpmdev-bumpspec). -* Fri Dec 26 2008 Ville Skyttä - 7.0-1 +* Fri Dec 26 2008 Ville Skyttä - 7.0-1 - 7.0. - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055). - Add man page for rpmdev-newspec. -* Tue Dec 16 2008 Ville Skyttä +* Tue Dec 16 2008 Ville Skyttä - Add imake and intltool to internal list of devel packages in rmdevelrpms. -* Sat Dec 13 2008 Ville Skyttä +* Sat Dec 13 2008 Ville Skyttä - Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). -* Wed Nov 26 2008 Ville Skyttä +* Wed Nov 26 2008 Ville Skyttä - Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms (#472641, Michael Schwendt). -* Thu Nov 20 2008 Ville Skyttä +* Thu Nov 20 2008 Ville Skyttä - Drop "minimal buildroot" dependencies. - Drop fedora-rpmdevtools Obsoletes. -* Mon Oct 13 2008 Ville Skyttä +* Mon Oct 13 2008 Ville Skyttä - Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). -* Fri Sep 26 2008 Ville Skyttä +* Fri Sep 26 2008 Ville Skyttä - Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). - Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's user string. -* Thu Sep 25 2008 Ville Skyttä +* Thu Sep 25 2008 Ville Skyttä - Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). -* Mon Sep 22 2008 Ville Skyttä +* Mon Sep 22 2008 Ville Skyttä - Switch to lzma compressed tarball. -* Sun Sep 7 2008 Ville Skyttä +* Sun Sep 7 2008 Ville Skyttä - Improve arch specific %%files in perl spec template (#461177, Chris Weyl). -* Sun Aug 3 2008 Ville Skyttä - 6.7-1 +* Sun Aug 3 2008 Ville Skyttä - 6.7-1 - 6.7. - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. -* Sat Apr 26 2008 Ville Skyttä +* Sat Apr 26 2008 Ville Skyttä - Make rpmls work with URLs. -* Sun Apr 20 2008 Ville Skyttä +* Sun Apr 20 2008 Ville Skyttä - Include rpm arch in dir names created by rpmdev-extract (#443266). -* Fri Apr 18 2008 Ville Skyttä +* Fri Apr 18 2008 Ville Skyttä - Remove duplicate "reload" from case block in init script template. - Fix exit status of "reload" in case service is not running in init script template (#442993). -* Thu Mar 27 2008 Ville Skyttä - 6.6-1 +* Thu Mar 27 2008 Ville Skyttä - 6.6-1 - Fix man page generation. -* Wed Mar 26 2008 Ville Skyttä - 6.5-1 +* Wed Mar 26 2008 Ville Skyttä - 6.5-1 - 6.5. -* Sun Mar 23 2008 Ville Skyttä +* Sun Mar 23 2008 Ville Skyttä - Generate man pages at build time. -* Sat Mar 22 2008 Ville Skyttä +* Sat Mar 22 2008 Ville Skyttä - Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion list, they're not essential on non-devel systems any more. -* Mon Mar 17 2008 Ville Skyttä +* Mon Mar 17 2008 Ville Skyttä - Include ocaml spec template. -* Tue Mar 11 2008 Ville Skyttä +* Tue Mar 11 2008 Ville Skyttä - Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec). -* Tue Feb 12 2008 Ville Skyttä +* Tue Feb 12 2008 Ville Skyttä - Sync with qa-robot upstream. - Update spectool to 1.0.10. -* Sun Feb 3 2008 Ville Skyttä +* Sun Feb 3 2008 Ville Skyttä - Add support for 7-zip, lzma and lzo in rpmdev-extract. -* Fri Feb 1 2008 Ville Skyttä +* Fri Feb 1 2008 Ville Skyttä - Add ';;' to the init script template's reload action. -* Sat Dec 8 2007 Ville Skyttä +* Sat Dec 8 2007 Ville Skyttä - Add fonts spec template from the Fedora Fonts SIG (#407781). - Add option to use macro style instead of shell style variables to newspec. - Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in @@ -265,149 +268,149 @@ rm -rf $RPM_BUILD_ROOT * Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 - Fix paths in qa-robot tools -* Sat Sep 8 2007 Ville Skyttä - 6.2-1 +* Sat Sep 8 2007 Ville Skyttä - 6.2-1 - Sync deps with Fedora's new "assumed present in buildroots" packages list. -* Thu Sep 6 2007 Ville Skyttä +* Thu Sep 6 2007 Ville Skyttä - Init script template cleanups. -* Tue Aug 28 2007 Ville Skyttä +* Tue Aug 28 2007 Ville Skyttä - Update rpminfo to version 2004-07-07-02. -* Fri Aug 10 2007 Ville Skyttä - 6.1-1 +* Fri Aug 10 2007 Ville Skyttä - 6.1-1 - Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -* Mon Aug 6 2007 Ville Skyttä +* Mon Aug 6 2007 Ville Skyttä - Work around #250990 in rpmls and rpmdev-extract. - Clarify copyright info of rpmdev-* and rpmls. -* Sat Jul 7 2007 Ville Skyttä +* Sat Jul 7 2007 Ville Skyttä - Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2. - The long form of the list option in rmdevelrpms is --list-only, not --list. -* Thu Jul 5 2007 Ville Skyttä - 6.0-1 +* Thu Jul 5 2007 Ville Skyttä - 6.0-1 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. - Drop explicit dependency on patch, pulled in by recent rpm-build. - Add cmake and scons to default devel package list in rpmdev-rmdevelrpms. - Add LSB comment block to init script template. -* Wed Jun 27 2007 Ville Skyttä +* Wed Jun 27 2007 Ville Skyttä - Add 2-argument form for comparing EVR strings to rpmdev-vercmp (available only if rpmUtils.miscutils is available). -* Sat Jun 16 2007 Ville Skyttä +* Sat Jun 16 2007 Ville Skyttä - Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, rpmsoname) from ALT Linux's qa-robot package. - Include rpmls (#213778). -* Fri Jun 15 2007 Ville Skyttä +* Fri Jun 15 2007 Ville Skyttä - Update spectool to 1.0.9 (#243731). -* Wed Apr 11 2007 Ville Skyttä +* Wed Apr 11 2007 Ville Skyttä - Add --list-only option to rmdevelrpms (Thorsten Leemhuis). -* Tue Mar 13 2007 Ville Skyttä +* Tue Mar 13 2007 Ville Skyttä - BR perl(ExtUtils::MakeMaker) by default in perl spec template. - Drop deprecated backwards compatibility with fedora-rpmdevtools. - Update URL. -* Wed Nov 8 2006 Ville Skyttä +* Wed Nov 8 2006 Ville Skyttä - Arch-qualify output of matched packages in rmdevelrpms and allow arch-qualified packages in the config file. -* Wed Oct 25 2006 Ville Skyttä - 5.3-1 +* Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. -* Mon Oct 2 2006 Ville Skyttä - 5.2-1 +* Mon Oct 2 2006 Ville Skyttä - 5.2-1 - Skip *.jar.so.debug in check-buildroot (#208903). - Treat yasm and *-static as devel packages in rmdevelrpms. -* Sat Sep 9 2006 Ville Skyttä - 5.1-1 +* Sat Sep 9 2006 Ville Skyttä - 5.1-1 - Re-add PHP PEAR spec template, more improvements to it (#198706, Christopher Stone, Remi Collet). -* Tue Aug 22 2006 Ville Skyttä - 5.0-2 +* Tue Aug 22 2006 Ville Skyttä - 5.0-2 - Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools. -* Sun Aug 20 2006 Ville Skyttä - 5.0-1 +* Sun Aug 20 2006 Ville Skyttä - 5.0-1 - Re-rename almost everything to rpmdev-*, with backwards compat symlinks. - Don't encourage %%ghost'ing *.pyo in Python spec template, add some comments. - Drop PHP PEAR spec template, it's not ready yet. -* Wed Aug 2 2006 Ville Skyttä +* Wed Aug 2 2006 Ville Skyttä - Treat *-sdk as devel packages in rmdevelrpms (#199909). - Don't assume compface is a devel package in rmdevelrpms. -* Thu Jul 20 2006 Ville Skyttä +* Thu Jul 20 2006 Ville Skyttä - Mark things that are not needed for noarch module packages in the Perl spec template. -* Wed Jul 19 2006 Ville Skyttä +* Wed Jul 19 2006 Ville Skyttä - Move option arguments to "find" before non-option ones in Perl spec template. - Drop python-abi dependency from Python spec template (#189947). -* Tue Jul 18 2006 Ville Skyttä +* Tue Jul 18 2006 Ville Skyttä - Add PHP PEAR spec template (#198706, Christopher Stone). -* Mon Jul 17 2006 Ville Skyttä +* Mon Jul 17 2006 Ville Skyttä - Drop fedora- prefix everywhere, add backcompat symlinks for execubtables. - Move %%{_sysconfdir}/fedora to %%{_sysconfdir}/rpmdevtools and %%{_datadir}/fedora to %%{_datadir}/rpmdevtools. - Move spec templates to %%{_sysconfdir}/rpmdevtools, mark as config. - Bump version to 5.0. -* Sun Jul 16 2006 Ville Skyttä +* Sun Jul 16 2006 Ville Skyttä - Drop fedora-kmodhelper. - Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use the system rpmdb. -* Sat Jul 15 2006 Ville Skyttä +* Sat Jul 15 2006 Ville Skyttä - Sort rmdevelrpms' output. -* Fri Jul 7 2006 Ville Skyttä +* Fri Jul 7 2006 Ville Skyttä - Improve ruby spec template (#180066, David Lutterkort). -* Mon Jun 5 2006 Ville Skyttä +* Mon Jun 5 2006 Ville Skyttä - Add manual pages for rmdevelrpms, diffarchive and extract. - Trim pre-2005 changelog entries. - Autotoolize source tree. -* Tue May 16 2006 Ville Skyttä - 1.6-1 +* Tue May 16 2006 Ville Skyttä - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). -* Sun Feb 26 2006 Ville Skyttä - 1.5-1 +* Sun Feb 26 2006 Ville Skyttä - 1.5-1 - Improve diffarchive and extract error messages. -* Fri Feb 24 2006 Ville Skyttä +* Fri Feb 24 2006 Ville Skyttä - Update spectool to 1.0.7 (#162253). -* Thu Feb 9 2006 Ville Skyttä +* Thu Feb 9 2006 Ville Skyttä - Add file(1) based archive type detection to fedora-extract. -* Wed Feb 8 2006 Ville Skyttä +* Wed Feb 8 2006 Ville Skyttä - Add "diff file lists only" option to diffarchive. -* Sun Feb 5 2006 Ville Skyttä +* Sun Feb 5 2006 Ville Skyttä - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec use it for ruby-*. -* Sat Feb 4 2006 Ville Skyttä - 1.4-2 +* Sat Feb 4 2006 Ville Skyttä - 1.4-2 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). -* Fri Dec 30 2005 Ville Skyttä - 1.4-1 +* Fri Dec 30 2005 Ville Skyttä - 1.4-1 - Update spectool to 1.0.6 (#176521). -* Wed Dec 28 2005 Ville Skyttä +* Wed Dec 28 2005 Ville Skyttä - Update spectool to 1.0.5 (#162253), require wget for it. - Add disttags to spec templates. -* Thu Oct 27 2005 Ville Skyttä - 1.3-1 +* Thu Oct 27 2005 Ville Skyttä - 1.3-1 - check-rpaths-worker: detect when RPATH references the parent directory of an absolute path (#169298, Enrico Scholz). - Add regression test for check-rpaths* (#169298, Enrico Scholz). - Honor user's indent-tabs-mode setting in fedora-init.el (#170902). -* Fri Oct 7 2005 Ville Skyttä - 1.2-1 +* Fri Oct 7 2005 Ville Skyttä - 1.2-1 - check-buildroot: grep for buildroot as a fixed string, not a regexp. - Update FSF's address in copyright notices. - check-rpaths-worker: allow multiple $ORIGIN paths in an RPATH and allow @@ -418,12 +421,12 @@ rm -rf $RPM_BUILD_ROOT - Teach fedora-newrpmspec to detect and use different specfile variants. - Use fedora-newrpmspec in fedora-init.el. -* Fri Jul 8 2005 Ville Skyttä - 1.1-1 +* Fri Jul 8 2005 Ville Skyttä - 1.1-1 - Drop more pre-FC2 compat stuff from Perl spec template. - Treat gcc-gfortran as a devel package in rmdevelrpms. - Drop fedora.us GPG key. -* Thu Mar 24 2005 Ville Skyttä - 1.0-1 +* Thu Mar 24 2005 Ville Skyttä - 1.0-1 - Make fedora-diffarchive work better with archives containing dirs without read/execute permissions. - Sync "Epoch: 0" drops with Fedora Extras CVS. @@ -438,11 +441,11 @@ rm -rf $RPM_BUILD_ROOT - Don't try to remove gcc-java and related packages by default in rmdevelrpms. - Remove "full featured" spec template, convert newrpmspec to use -minimal. -* Sun Feb 6 2005 Ville Skyttä - 0:0.3.1-1 +* Sun Feb 6 2005 Ville Skyttä - 0:0.3.1-1 - Make buildrpmtree and wipebuildtree less dependent on a specific configuration (#147014, Ignacio Vazquez-Abrams). -* Tue Jan 18 2005 Ville Skyttä - 0:0.3.0-1 +* Tue Jan 18 2005 Ville Skyttä - 0:0.3.0-1 - Remove 0.fdr. prefixes and epoch 0's from all spec templates. - Add try-restart action to init script template. - Remove deprecated fedora-diffrpm and fedora-unrpm. diff --git a/sources b/sources index e11337b..3e1f94c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -8407f2e7f2037ec28ca7910fed2c3498 rpmdevtools-7.4.tar.xz +ec396743a9d350ac4a6d5a104807ccca rpmdevtools-7.5.tar.xz From e7bedcff4e162cc9b1528ddba364dc2f490da655 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:13:20 +0000 Subject: [PATCH 021/107] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3971401..5e3f83e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := rpmdevtools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4ada163a7d3b30e44896cb49a53986dac758b8d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:16 +0000 Subject: [PATCH 022/107] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3971401..fadf82f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: rpmdevtools -# $Id$ +# $Id: Makefile,v 1.1 2006/08/20 19:34:36 scop Exp $ NAME := rpmdevtools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a435d7b2d4e904211b3f774ae0d56930df9bcf89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 7 Dec 2009 20:50:04 +0000 Subject: [PATCH 023/107] - Update to 7.6, fixes #528907. --- .cvsignore | 2 +- rpmdevtools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d76cb84..4bfead1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.5.tar.xz +rpmdevtools-7.6.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ec80ecf..260a3b0 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.5 +Version: 7.6 Release: 1%{?dist} Summary: RPM Development Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 7 2009 Ville Skyttä - 7.6-1 +- Update to 7.6, fixes #528907. + * Thu Sep 17 2009 Ville Skyttä - 7.5-1 - Update to 7.5, fixes #502403. diff --git a/sources b/sources index 3e1f94c..3ede5a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -ec396743a9d350ac4a6d5a104807ccca rpmdevtools-7.5.tar.xz +7784f1a70aef5d3c94eaa2803c3e1478 rpmdevtools-7.6.tar.xz From 6080e1381c0cceb6673c1f0781277f1d621db971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 1 Feb 2010 22:51:52 +0000 Subject: [PATCH 024/107] - Update to 7.7, fixes #558263. --- .cvsignore | 2 +- rpmdevtools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4bfead1..0889643 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.6.tar.xz +rpmdevtools-7.7.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 260a3b0..57c2526 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.6 +Version: 7.7 Release: 1%{?dist} Summary: RPM Development Tools @@ -31,7 +31,7 @@ Requires: gawk Requires: grep Requires: man Requires: python >= 2.4 -Requires: rpm-build >= 4.4.2.1 +Requires: rpm-build >= 4.4.2.3 Requires: rpm-python Requires: sed Requires: wget @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 2 2010 Ville Skyttä - 7.7-1 +- Update to 7.7, fixes #558263. + * Mon Dec 7 2009 Ville Skyttä - 7.6-1 - Update to 7.6, fixes #528907. diff --git a/sources b/sources index 3ede5a9..d1b0ce5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -7784f1a70aef5d3c94eaa2803c3e1478 rpmdevtools-7.6.tar.xz +b6c935120963107693a252336f1b4db6 rpmdevtools-7.7.tar.xz From b3408790ad15174638c98fbafe8efbbb8d158388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 15 Feb 2010 22:14:22 +0000 Subject: [PATCH 025/107] - Update to 7.8, fixes #562316. --- .cvsignore | 2 +- rpmdevtools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0889643..4507054 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.7.tar.xz +rpmdevtools-7.8.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 57c2526..89c3c93 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.7 +Version: 7.8 Release: 1%{?dist} Summary: RPM Development Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 16 2010 Ville Skyttä - 7.8-1 +- Update to 7.8, fixes #562316. + * Tue Feb 2 2010 Ville Skyttä - 7.7-1 - Update to 7.7, fixes #558263. diff --git a/sources b/sources index d1b0ce5..ddf2c5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -b6c935120963107693a252336f1b4db6 rpmdevtools-7.7.tar.xz +a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz From 8ba17b07e067679062cbc6297534ec3d2d112ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 16 Apr 2010 15:54:46 +0000 Subject: [PATCH 026/107] - Require %{_bindir}/man instead of man (#582932). --- rpmdevtools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 89c3c93..6a33cae 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -29,7 +29,7 @@ Requires: file Requires: findutils Requires: gawk Requires: grep -Requires: man +Requires: %{_bindir}/man Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.3 Requires: rpm-python @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 16 2010 Ville Skyttä - 7.8-2 +- Require %%{_bindir}/man instead of man (#582932). + * Tue Feb 16 2010 Ville Skyttä - 7.8-1 - Update to 7.8, fixes #562316. From d983deaa692dede834dae0bb976fdf9054f96adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 20 May 2010 20:12:56 +0000 Subject: [PATCH 027/107] - Update to 7.9, fixes #588313 and #589705. --- .cvsignore | 2 +- rpmdevtools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4507054..379f7b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.8.tar.xz +rpmdevtools-7.9.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 6a33cae..b0ddcbb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,8 +3,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.8 -Release: 2%{?dist} +Version: 7.9 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 20 2010 Ville Skyttä - 7.9-1 +- Update to 7.9, fixes #588313 and #589705. + * Fri Apr 16 2010 Ville Skyttä - 7.8-2 - Require %%{_bindir}/man instead of man (#582932). diff --git a/sources b/sources index ddf2c5b..9131e6b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz +48b0c77432b2f2dfa8d8e67c2f565e7d rpmdevtools-7.9.tar.xz From 82436c4ab4b21dd17006dc309343f5bf95390afc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:28 +0000 Subject: [PATCH 028/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fadf82f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rpmdevtools -# $Id: Makefile,v 1.1 2006/08/20 19:34:36 scop Exp $ -NAME := rpmdevtools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 73fdda6236d2226c6b1dc4c9878d9eca6507f15d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:30 +0000 Subject: [PATCH 029/107] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5e3f83e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rpmdevtools -# $Id$ -NAME := rpmdevtools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 65694a9c83de2ae8f28d6f2dc0bcf99bcfbeed6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 27 Sep 2010 21:26:31 +0300 Subject: [PATCH 030/107] - Update to 7.10, fixes #595135 and #619867. - Patch spectool to work with specfiles containing Icon and BuildArchitectures (#637000). --- .gitignore | 4 ++-- rpmdevtools.spec | 9 ++++++++- sources | 2 +- spectool-1.0.10-problemtags-637000.patch | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 spectool-1.0.10-problemtags-637000.patch diff --git a/.gitignore b/.gitignore index 379f7b2..e7d16f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -spectool-1.0.10.tar.bz2 -rpmdevtools-7.9.tar.xz +/spectool-1.0.10.tar.bz2 +/rpmdevtools-7.10.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b0ddcbb..df38910 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.9 +Version: 7.10 Release: 1%{?dist} Summary: RPM Development Tools @@ -14,6 +14,7 @@ URL: https://fedorahosted.org/rpmdevtools/ Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 Patch0: spectool-1.0.10-sourcenum.patch +Patch1: spectool-1.0.10-problemtags-637000.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -61,6 +62,7 @@ rpmdev-bumpspec Bump revision in specfile cp -p spectool-%{spectool_version}/README README.spectool cd spectool-%{spectool_version} %patch0 -p1 +%patch1 -p1 cd .. @@ -114,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 27 2010 Ville Skyttä - 7.10-1 +- Update to 7.10, fixes #595135 and #619867. +- Patch spectool to work with specfiles containing Icon or BuildArchitectures + (#637000). + * Thu May 20 2010 Ville Skyttä - 7.9-1 - Update to 7.9, fixes #588313 and #589705. diff --git a/sources b/sources index 9131e6b..2dee1ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -48b0c77432b2f2dfa8d8e67c2f565e7d rpmdevtools-7.9.tar.xz +b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz diff --git a/spectool-1.0.10-problemtags-637000.patch b/spectool-1.0.10-problemtags-637000.patch new file mode 100644 index 0000000..047b526 --- /dev/null +++ b/spectool-1.0.10-problemtags-637000.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/637000 + +diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool +--- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200 ++++ spectool-1.0.10/spectool 2010-09-27 19:17:31.483281717 +0300 +@@ -108,7 +108,7 @@ sub eval_sources_patches { + last; + } + } +- next if ($line =~ m/^\s*(BuildArch|Exclu(d|siv)e(Arch|OS))\s*:/i); ++ next if ($line =~ m/^\s*(BuildArch(itectures)?|Exclu(d|siv)e(Arch|OS)|Icon)\s*:/i); + $preamble .= $line; + if ($line !~ m/^\s*(?:source|patch)\d*\s*:/) { + print $tmpspec_fh $line; From 3dc51dea02e8cfd2ae641508c18c356c7e2a58d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 9 Dec 2010 22:12:50 +0200 Subject: [PATCH 031/107] Add note why spectool is not updated to 1.0.11. --- rpmdevtools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index df38910..8e4ce00 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,5 +1,7 @@ %global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d %global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d +# Intentionally not updating spectool to 1.0.11, it uses a problematic +# wget -N -O combination. %global spectool_version 1.0.10 Name: rpmdevtools From cd37a3e3379506544275504901d7df42059cdfc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Feb 2011 16:32:43 +0200 Subject: [PATCH 032/107] Update to 8.0, fixes #519061 and #657594. --- .gitignore | 3 +- rpmdevtools.spec | 62 +++++++++++++----------- sources | 3 +- spectool-1.0.10-problemtags-637000.patch | 14 ------ spectool-1.0.10-sourcenum.patch | 17 ------- 5 files changed, 35 insertions(+), 64 deletions(-) delete mode 100644 spectool-1.0.10-problemtags-637000.patch delete mode 100644 spectool-1.0.10-sourcenum.patch diff --git a/.gitignore b/.gitignore index e7d16f3..9a56fb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/spectool-1.0.10.tar.bz2 -/rpmdevtools-7.10.tar.xz +/rpmdevtools-8.0.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8e4ce00..ccf604e 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,11 +1,7 @@ -%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -# Intentionally not updating spectool to 1.0.11, it uses a problematic -# wget -N -O combination. -%global spectool_version 1.0.10 +%global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.10 +Version: 8.0 Release: 1%{?dist} Summary: RPM Development Tools @@ -14,9 +10,6 @@ Group: Development/Tools License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz -Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 -Patch0: spectool-1.0.10-sourcenum.patch -Patch1: spectool-1.0.10-problemtags-637000.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,7 +18,12 @@ BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: python >= 2.4 BuildRequires: rpm-python +# emacs-common >= 1:22.3-3 for macros.emacs +BuildRequires: emacs-common >= 1:22.3-3 +# xemacs-common >= 21.5.29-8 for macros.xemacs +BuildRequires: xemacs-common >= 21.5.29-8 Provides: spectool = %{spectool_version} +Requires: curl Requires: diffutils Requires: fakeroot Requires: file @@ -37,7 +35,9 @@ Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.3 Requires: rpm-python Requires: sed -Requires: wget +%if 0%{?fedora} > 14 +Requires: emacs-filesystem +%endif # For _get_cword in bash completion snippet Conflicts: bash-completion < 20080705 @@ -60,12 +60,7 @@ rpmdev-bumpspec Bump revision in specfile %prep -%setup -q -a 1 -cp -p spectool-%{spectool_version}/README README.spectool -cd spectool-%{spectool_version} -%patch0 -p1 -%patch1 -p1 -cd .. +%setup -q %build @@ -78,9 +73,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir} - -for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do +for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do install -dm 755 $RPM_BUILD_ROOT$dir ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc @@ -91,33 +84,44 @@ done rm -rf $RPM_BUILD_ROOT +%if 0%{?fedora} <= 14 %triggerin -- emacs-common -[ -d %{emacs_sitestart_d} ] && \ - ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || : - -%triggerin -- xemacs-common -[ -d %{xemacs_sitestart_d} ] && \ - ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{xemacs_sitestart_d} || : +[ -d %{_emacs_sitestartdir} ] && \ + ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_emacs_sitestartdir} || : %triggerun -- emacs-common -[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/rpmdev-init.el* || : +[ $2 -eq 0 ] && rm -f %{_emacs_sitestartdir}/rpmdev-init.el* || : +%endif + +%triggerin -- xemacs-common +[ -d %{_xemacs_sitestartdir} ] && \ + ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_xemacs_sitestartdir} || : %triggerun -- xemacs-common -[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/rpmdev-init.el* || : +[ $2 -eq 0 ] && rm -f %{_xemacs_sitestartdir}/rpmdev-init.el* || : %files %defattr(-,root,root,-) -%doc COPYING NEWS README* +%doc COPYING NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ %{_bindir}/* -%ghost %{_datadir}/*emacs +%if 0%{?fedora} > 14 +%{_emacs_sitestartdir}/rpmdev-init.el +%ghost %{_emacs_sitestartdir}/rpmdev-init.elc +%else +%ghost %{_datadir}/emacs +%endif +%ghost %{_datadir}/xemacs %{_mandir}/man[18]/*.[18]* %changelog +* Sun Feb 6 2011 Ville Skyttä - 8.0-1 +- Update to 8.0, fixes #519061 and #657594. + * Mon Sep 27 2010 Ville Skyttä - 7.10-1 - Update to 7.10, fixes #595135 and #619867. - Patch spectool to work with specfiles containing Icon or BuildArchitectures diff --git a/sources b/sources index 2dee1ff..b0a3641 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz +506d498af400c9739a0fcb7f611b3c2a rpmdevtools-8.0.tar.xz diff --git a/spectool-1.0.10-problemtags-637000.patch b/spectool-1.0.10-problemtags-637000.patch deleted file mode 100644 index 047b526..0000000 --- a/spectool-1.0.10-problemtags-637000.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.redhat.com/637000 - -diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool ---- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200 -+++ spectool-1.0.10/spectool 2010-09-27 19:17:31.483281717 +0300 -@@ -108,7 +108,7 @@ sub eval_sources_patches { - last; - } - } -- next if ($line =~ m/^\s*(BuildArch|Exclu(d|siv)e(Arch|OS))\s*:/i); -+ next if ($line =~ m/^\s*(BuildArch(itectures)?|Exclu(d|siv)e(Arch|OS)|Icon)\s*:/i); - $preamble .= $line; - if ($line !~ m/^\s*(?:source|patch)\d*\s*:/) { - print $tmpspec_fh $line; diff --git a/spectool-1.0.10-sourcenum.patch b/spectool-1.0.10-sourcenum.patch deleted file mode 100644 index c9a0581..0000000 --- a/spectool-1.0.10-sourcenum.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix for -s x,y, -p x,y from Todd Zullinger: -https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html - -diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool ---- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200 -+++ spectool-1.0.10/spectool 2009-08-21 02:12:56.000000000 +0300 -@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command = - 'v|verbose' => sub { $verbose++; }, - 'n|dryrun|dry-run' => sub { $dryrun = 1; }, - 'V|version' => sub { $command = 'version'; }, -- 's|source=i' => \@sources, -- 'p|patch=i' => \@patches, -+ 's|source=s' => \@sources, -+ 'p|patch=s' => \@patches, - 'S|sources' => sub { push @what, 'sources'; }, - 'P|patches' => sub { push @what, 'patches'; }, - 'A|all' => sub { push @what, 'all'; }, From d71ee8811c7b1c4e4b94c29b049ff7073ef7af8b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 02:42:46 -0600 Subject: [PATCH 033/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ccf604e..dc8098f 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Feb 6 2011 Ville Skyttä - 8.0-1 - Update to 8.0, fixes #519061 and #657594. From 155b05dfecb783f0adf4654d699ec9e7ef02e009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 22 Mar 2011 18:19:17 +0200 Subject: [PATCH 034/107] Require xemacs-filesystem on F-15+ (#672093). --- rpmdevtools.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index dc8098f..7ccdef5 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -37,6 +37,7 @@ Requires: rpm-python Requires: sed %if 0%{?fedora} > 14 Requires: emacs-filesystem +Requires: xemacs-filesystem %endif # For _get_cword in bash completion snippet Conflicts: bash-completion < 20080705 @@ -91,7 +92,6 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- emacs-common [ $2 -eq 0 ] && rm -f %{_emacs_sitestartdir}/rpmdev-init.el* || : -%endif %triggerin -- xemacs-common [ -d %{_xemacs_sitestartdir} ] && \ @@ -99,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- xemacs-common [ $2 -eq 0 ] && rm -f %{_xemacs_sitestartdir}/rpmdev-init.el* || : +%endif %files @@ -111,14 +112,19 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?fedora} > 14 %{_emacs_sitestartdir}/rpmdev-init.el %ghost %{_emacs_sitestartdir}/rpmdev-init.elc +%{_xemacs_sitestartdir}/rpmdev-init.el +%ghost %{_xemacs_sitestartdir}/rpmdev-init.elc %else %ghost %{_datadir}/emacs -%endif %ghost %{_datadir}/xemacs +%endif %{_mandir}/man[18]/*.[18]* %changelog +* Tue Mar 1 2011 Ville Skyttä - 8.0-3 +- Require xemacs-filesystem on F-15+ (#672093). + * Wed Feb 09 2011 Fedora Release Engineering - 8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c44d9fd00bb7483d5209b083e33edfec3720fc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Apr 2011 10:58:37 +0300 Subject: [PATCH 035/107] Update to 8.1. --- .gitignore | 2 +- rpmdevtools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9a56fb6..35da925 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/rpmdevtools-8.0.tar.xz +/rpmdevtools-8.1.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 7ccdef5..eb9a988 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,8 +1,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.0 -Release: 3%{?dist} +Version: 8.1 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 26 2011 Ville Skyttä - 8.1-1 +- Update to 8.1. + * Tue Mar 1 2011 Ville Skyttä - 8.0-3 - Require xemacs-filesystem on F-15+ (#672093). diff --git a/sources b/sources index b0a3641..5c38452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -506d498af400c9739a0fcb7f611b3c2a rpmdevtools-8.0.tar.xz +71541d89592f485770a85f64632eda35 rpmdevtools-8.1.tar.xz From ba8fba6d3f6f56c240df0b34df51a585c3854965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 12 Nov 2011 18:18:50 +0200 Subject: [PATCH 036/107] Update to 8.2. --- .gitignore | 2 +- rpmdevtools.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 35da925..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/rpmdevtools-8.1.tar.xz +/*.tar.* diff --git a/rpmdevtools.spec b/rpmdevtools.spec index eb9a988..8281ccc 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,7 +1,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.1 +Version: 8.2 Release: 1%{?dist} Summary: RPM Development Tools @@ -39,8 +39,6 @@ Requires: sed Requires: emacs-filesystem Requires: xemacs-filesystem %endif -# For _get_cword in bash completion snippet -Conflicts: bash-completion < 20080705 %description This package contains scripts and (X)Emacs support files to aid in @@ -103,7 +101,6 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc COPYING NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_sysconfdir}/bash_completion.d/ @@ -122,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 12 2011 Ville Skyttä - 8.2-1 +- Update to 8.2. + * Tue Apr 26 2011 Ville Skyttä - 8.1-1 - Update to 8.1. diff --git a/sources b/sources index 5c38452..cf9a4cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71541d89592f485770a85f64632eda35 rpmdevtools-8.1.tar.xz +aaba5b4911911c939ce753fade6a1ec7 rpmdevtools-8.2.tar.xz From a3c470b7d7193e75604eb08d08e5cf12a47e9484 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 20:56:12 -0600 Subject: [PATCH 037/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8281ccc..ba79ee3 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Nov 12 2011 Ville Skyttä - 8.2-1 - Update to 8.2. From b9735455ed091968cde1b472eec90dd27548247b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 12:04:19 -0500 Subject: [PATCH 038/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ba79ee3..c85568a 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 62382c0bc5f37f57bcf0d1c52b3b0692bf46f477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 3 Sep 2012 00:13:02 +0300 Subject: [PATCH 039/107] Update to 8.3. - Drop specfile constructs no longer needed with Fedora's rpm. --- rpmdevtools.spec | 38 ++++++-------------------------------- sources | 2 +- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index c85568a..05b549b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,16 +1,14 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.2 -Release: 3%{?dist} +Version: 8.3 +Release: 1%{?dist} Summary: RPM Development Tools -Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # help2man, pod2man, *python for creating man pages @@ -35,10 +33,8 @@ Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.3 Requires: rpm-python Requires: sed -%if 0%{?fedora} > 14 Requires: emacs-filesystem Requires: xemacs-filesystem -%endif %description This package contains scripts and (X)Emacs support files to aid in @@ -79,46 +75,24 @@ for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do done -%clean -rm -rf $RPM_BUILD_ROOT - - -%if 0%{?fedora} <= 14 -%triggerin -- emacs-common -[ -d %{_emacs_sitestartdir} ] && \ - ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_emacs_sitestartdir} || : - -%triggerun -- emacs-common -[ $2 -eq 0 ] && rm -f %{_emacs_sitestartdir}/rpmdev-init.el* || : - -%triggerin -- xemacs-common -[ -d %{_xemacs_sitestartdir} ] && \ - ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_xemacs_sitestartdir} || : - -%triggerun -- xemacs-common -[ $2 -eq 0 ] && rm -f %{_xemacs_sitestartdir}/rpmdev-init.el* || : -%endif - - %files %doc COPYING NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ %{_bindir}/* -%if 0%{?fedora} > 14 %{_emacs_sitestartdir}/rpmdev-init.el %ghost %{_emacs_sitestartdir}/rpmdev-init.elc %{_xemacs_sitestartdir}/rpmdev-init.el %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc -%else -%ghost %{_datadir}/emacs -%ghost %{_datadir}/xemacs -%endif %{_mandir}/man[18]/*.[18]* %changelog +* Sun Sep 2 2012 Ville Skyttä - 8.3-1 +- Update to 8.3. +- Drop specfile constructs no longer needed with Fedora's rpm. + * Sat Jul 21 2012 Fedora Release Engineering - 8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index cf9a4cd..700109a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaba5b4911911c939ce753fade6a1ec7 rpmdevtools-8.2.tar.xz +d54e74f28acc4bf3922a558f522beb94 rpmdevtools-8.3.tar.xz From 432028f0982f80cf307af64c01ed38a2683c4268 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 17 Oct 2012 13:23:16 +0200 Subject: [PATCH 040/107] - xemacs is not available on RHEL (RHBZ#866841) --- rpmdevtools.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 05b549b..4ff7525 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -18,8 +18,10 @@ BuildRequires: python >= 2.4 BuildRequires: rpm-python # emacs-common >= 1:22.3-3 for macros.emacs BuildRequires: emacs-common >= 1:22.3-3 +%if 0%{?fedora} # xemacs-common >= 21.5.29-8 for macros.xemacs BuildRequires: xemacs-common >= 21.5.29-8 +%endif Provides: spectool = %{spectool_version} Requires: curl Requires: diffutils @@ -34,7 +36,9 @@ Requires: rpm-build >= 4.4.2.3 Requires: rpm-python Requires: sed Requires: emacs-filesystem +%if 0%{?fedora} Requires: xemacs-filesystem +%endif %description This package contains scripts and (X)Emacs support files to aid in @@ -68,7 +72,11 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%if 0%{?fedora} for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do +%else +for dir in %{_emacs_sitestartdir} ; do +%endif install -dm 755 $RPM_BUILD_ROOT$dir ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc @@ -83,12 +91,17 @@ done %{_bindir}/* %{_emacs_sitestartdir}/rpmdev-init.el %ghost %{_emacs_sitestartdir}/rpmdev-init.elc +%if 0%{?fedora} %{_xemacs_sitestartdir}/rpmdev-init.el %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc +%endif %{_mandir}/man[18]/*.[18]* %changelog +* Tue Oct 16 2012 Thomas Woerner - 8.3-2 +- xemacs is not available on RHEL (RHBZ#866841) + * Sun Sep 2 2012 Ville Skyttä - 8.3-1 - Update to 8.3. - Drop specfile constructs no longer needed with Fedora's rpm. From 0ed1cf6ca9fd2a5e67f0fa2417e5ad8fb5f19a8f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 15:52:53 -0600 Subject: [PATCH 041/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 4ff7525..b09a1ec 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -99,6 +99,9 @@ done %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Oct 16 2012 Thomas Woerner - 8.3-2 - xemacs is not available on RHEL (RHBZ#866841) From 69ac675da63beb190282ccbbaaeaf8aee3f79225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 15:51:11 +0200 Subject: [PATCH 042/107] Perl 5.18 rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b09a1ec..df205e1 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -99,6 +99,9 @@ done %changelog +* Wed Jul 17 2013 Petr Pisar - 8.3-4 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 8.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 81eb9a46144afb447d5872fed68aaafced1b4415 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 07:59:05 -0500 Subject: [PATCH 043/107] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rpmdevtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index df205e1..b8f56de 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -99,6 +99,9 @@ done %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 8.3-4 - Perl 5.18 rebuild From 946688ebc6ea99f6b5c994819c0d4accf6dc8b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 7 Oct 2013 23:41:09 +0300 Subject: [PATCH 044/107] Update to 8.4. --- rpmdevtools.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b8f56de..11d3e87 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,8 +1,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 8.3 -Release: 5%{?dist} +Version: 8.4 +Release: 1%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -30,7 +30,6 @@ Requires: file Requires: findutils Requires: gawk Requires: grep -Requires: %{_bindir}/man Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.3 Requires: rpm-python @@ -39,6 +38,10 @@ Requires: emacs-filesystem %if 0%{?fedora} Requires: xemacs-filesystem %endif +%if 0%{?fedora} && 0%{?fedora} < 21 +# Transition from bundled to non-bundled devscripts, just for updates +Requires(pre): devscripts +%endif %description This package contains scripts and (X)Emacs support files to aid in @@ -99,6 +102,9 @@ done %changelog +* Mon Oct 7 2013 Ville Skyttä - 8.4-1 +- Update to 8.4. + * Sun Aug 04 2013 Fedora Release Engineering - 8.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 700109a..56aa2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d54e74f28acc4bf3922a558f522beb94 rpmdevtools-8.3.tar.xz +9d1d3cc2f1108918be4766143162389a rpmdevtools-8.4.tar.xz From 1ca57fa989d94327b057c53ec3087456b9807cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 19 Oct 2013 09:24:12 +0300 Subject: [PATCH 045/107] Do not require devscripts in any scenario. --- rpmdevtools.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 11d3e87..8a591d3 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -2,7 +2,7 @@ Name: rpmdevtools Version: 8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -38,10 +38,6 @@ Requires: emacs-filesystem %if 0%{?fedora} Requires: xemacs-filesystem %endif -%if 0%{?fedora} && 0%{?fedora} < 21 -# Transition from bundled to non-bundled devscripts, just for updates -Requires(pre): devscripts -%endif %description This package contains scripts and (X)Emacs support files to aid in @@ -102,6 +98,9 @@ done %changelog +* Thu Oct 17 2013 Ville Skyttä - 8.4-2 +- Do not require devscripts in any scenario. + * Mon Oct 7 2013 Ville Skyttä - 8.4-1 - Update to 8.4. From 2e66162ac5f73138c755f639de0d76e4cc9ecd85 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:56:03 -0500 Subject: [PATCH 046/107] - 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 047/107] 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 ac9154dbe16e27e2b078bd3b08275bcc662c0624 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 15 Mar 2015 20:02:53 +0100 Subject: [PATCH 048/107] Revert wrong merge from EL-6, use rpmdevtools-5.3-2.el5 as base --- .gitignore | 4 +- rpmdevtools-5.3-el53-conflict.patch | 12 ++ rpmdevtools.spec | 217 ++++------------------------ sources | 4 +- 4 files changed, 41 insertions(+), 196 deletions(-) create mode 100644 rpmdevtools-5.3-el53-conflict.patch diff --git a/.gitignore b/.gitignore index 5f6a19e..b91fbf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -spectool-1.0.10.tar.bz2 -rpmdevtools-6.8.tar.bz2 +/spectool-1.0.8.tar.bz2 +/rpmdevtools-5.3.tar.bz2 diff --git a/rpmdevtools-5.3-el53-conflict.patch b/rpmdevtools-5.3-el53-conflict.patch new file mode 100644 index 0000000..78023e2 --- /dev/null +++ b/rpmdevtools-5.3-el53-conflict.patch @@ -0,0 +1,12 @@ +diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker +--- rpmdevtools-5.3/check-rpaths-worker~ 2006-08-16 01:28:09.000000000 +0300 ++++ rpmdevtools-5.3/check-rpaths-worker 2009-01-01 20:23:06.000000000 +0200 +@@ -63,8 +63,6 @@ function showHint() + * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like + * \$ RPM_BUILD_ROOT= /usr/lib/rpm/check-rpaths + * +-* 'check-rpaths' is part of 'rpmdevtools'. +-* + ******************************************************************************* + EOF + } diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b895993..e2345c6 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,60 +1,30 @@ -%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%global spectool_version 1.0.10 +%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d +%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%define spectool_version 1.0.8 Name: rpmdevtools -Version: 6.8 -Release: 1%{?dist} +Version: 5.3 +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools -# rpmdev-setuptree is GPLv2, everything else GPLv2+ -License: GPLv2+ and GPLv2 -URL: https://fedorahosted.org/rpmdevtools/ -Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.bz2 +License: GPL +URL: http://fedora.redhat.com/ +Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 +# Avoid conflict with EL 5.3 rpm, #466939 +Patch0: %{name}-5.3-el53-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# All build deps for man page generation -BuildRequires: help2man -BuildRequires: %{_bindir}/pod2man -BuildRequires: python -BuildRequires: rpm-python Provides: spectool = %{spectool_version} Provides: fedora-rpmdevtools = %{version} Obsoletes: fedora-rpmdevtools < 5.0 +# Required for tool operations +Requires: rpm-python, python, cpio, sed, perl, wget, file # Minimal RPM build requirements -Requires: bash -Requires: bzip2 -Requires: coreutils -Requires: cpio -Requires: diffutils -Requires: findutils -Requires: gawk -Requires: gcc -Requires: gcc-c++ -Requires: grep -Requires: gzip -Requires: info -Requires: make -Requires: redhat-release -Requires: redhat-rpm-config -Requires: rpm-build >= 4.4.2.1 -Requires: sed -Requires: tar -Requires: unzip -Requires: util-linux -Requires: which -# Additionally required for tool operations -#Requires: cpio -Requires: fakeroot -Requires: file -Requires: perl -Requires: python -Requires: rpm-python >= 4.4.2.2 -#Requires: sed -Requires: wget +Requires: rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch +Requires: diffutils, gzip, bzip2, unzip %description This package contains scripts and (X)Emacs support files to aid in @@ -65,17 +35,16 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs 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 RPM package file +rpmdev-md5 Display the md5sum of all files in an RPM rpmdev-vercmp RPM version comparison checker 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 -...and many more. %prep %setup -q -a 1 +%patch0 -p1 cp -p spectool*/README README.spectool @@ -110,6 +79,10 @@ ln -s rpmdev-wipetree $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree ln -s rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo +%check +make check + + %clean rm -rf $RPM_BUILD_ROOT @@ -143,155 +116,15 @@ fi %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_datadir}/rpmdevtools/ -%{_bindir}/fedora-* -%{_bindir}/rpm* -%{_bindir}/spectool +%{_bindir}/* +%{_prefix}/lib/rpm/check-* %ghost %{_datadir}/*emacs -%{_mandir}/man[18]/rpm*.[18]* +%{_mandir}/man?/*.* %changelog -* Fri Apr 3 2009 Ville Skyttä - 6.8-1 -- 6.8. - -* Sun Feb 22 2009 Ville Skyttä -- Use %%global instead of %%define in spec templates. -- Handle %%global in addition to %%define in rpmdev-bumpspec. - -* Mon Jan 26 2009 Ville Skyttä -- Add result dependent exit statuses to rpmdev-vercmp. - -* Fri Dec 26 2008 Ville Skyttä -- Add minimum version to rpm-python dependency (for rpmdev-bumpspec). -- Add man page for rpmdev-newspec. - -* Tue Dec 16 2008 Ville Skyttä -- Add imake and intltool to internal list of devel packages in rmdevelrpms. - -* Sat Dec 13 2008 Ville Skyttä -- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). - -* Wed Nov 26 2008 Ville Skyttä -- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms - (#472641, Michael Schwendt). - -* Mon Oct 13 2008 Ville Skyttä -- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). - -* Fri Sep 26 2008 Ville Skyttä -- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). -- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's - user string. - -* Thu Sep 25 2008 Ville Skyttä -- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). - -* Sun Sep 7 2008 Ville Skyttä -- Improve arch specific %%files in perl spec template (#461177, Chris Weyl). - -* Sun Aug 3 2008 Ville Skyttä - 6.7-1 -- 6.7. -- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. - -* Sat Apr 26 2008 Ville Skyttä -- Make rpmls work with URLs. - -* Sun Apr 20 2008 Ville Skyttä -- Include rpm arch in dir names created by rpmdev-extract (#443266). - -* Fri Apr 18 2008 Ville Skyttä -- Remove duplicate "reload" from case block in init script template. -- Fix exit status of "reload" in case service is not running in init - script template (#442993). - -* Thu Mar 27 2008 Ville Skyttä - 6.6-1 -- Fix man page generation. - -* Wed Mar 26 2008 Ville Skyttä - 6.5-1 -- 6.5. - -* Sun Mar 23 2008 Ville Skyttä -- Generate man pages at build time. - -* Sat Mar 22 2008 Ville Skyttä -- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion - list, they're not essential on non-devel systems any more. - -* Mon Mar 17 2008 Ville Skyttä -- Include ocaml spec template. - -* Tue Mar 11 2008 Ville Skyttä -- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec). - -* Tue Feb 12 2008 Ville Skyttä -- Sync with qa-robot upstream. -- Update spectool to 1.0.10. - -* Sun Feb 3 2008 Ville Skyttä -- Add support for 7-zip, lzma and lzo in rpmdev-extract. - -* Fri Feb 1 2008 Ville Skyttä -- Add ';;' to the init script template's reload action. - -* Sat Dec 8 2007 Ville Skyttä -- Add option to use macro style instead of shell style variables to newspec. -- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in - rmdevelrpms. - -* Fri Oct 12 2007 Lubomir Kundrak - 6.4-1 -- Import the previous fix into CVS to resync, bump version - -* Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 -- Fix paths in qa-robot tools - -* Sat Sep 8 2007 Ville Skyttä - 6.2-1 -- Sync deps with Fedora's new "assumed present in buildroots" packages list. - -* Thu Sep 6 2007 Ville Skyttä -- Init script template cleanups. - -* Tue Aug 28 2007 Ville Skyttä -- Update rpminfo to version 2004-07-07-02. - -* Fri Aug 10 2007 Ville Skyttä - 6.1-1 -- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - -* Mon Aug 6 2007 Ville Skyttä -- Work around #250990 in rpmls and rpmdev-extract. -- Clarify copyright info of rpmdev-* and rpmls. - -* Sat Jul 7 2007 Ville Skyttä -- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2. -- The long form of the list option in rmdevelrpms is --list-only, not --list. - -* Thu Jul 5 2007 Ville Skyttä - 6.0-1 -- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. -- Drop explicit dependency on patch, pulled in by recent rpm-build. -- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms. -- Add LSB comment block to init script template. - -* Wed Jun 27 2007 Ville Skyttä -- Add 2-argument form for comparing EVR strings to rpmdev-vercmp - (available only if rpmUtils.miscutils is available). - -* Sat Jun 16 2007 Ville Skyttä -- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, - rpmsoname) from ALT Linux's qa-robot package. -- Include rpmls (#213778). - -* Fri Jun 15 2007 Ville Skyttä -- Update spectool to 1.0.9 (#243731). - -* Wed Apr 11 2007 Ville Skyttä -- Add --list-only option to rmdevelrpms (Thorsten Leemhuis). - -* Tue Mar 13 2007 Ville Skyttä -- BR perl(ExtUtils::MakeMaker) by default in perl spec template. -- Update URL. - -* Wed Nov 8 2006 Ville Skyttä -- Arch-qualify output of matched packages in rmdevelrpms and allow - arch-qualified packages in the config file. +* Thu Jan 1 2009 Ville Skyttä - 5.3-2 +- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen). * Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. diff --git a/sources b/sources index 68a41fd..cf0385a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -32a879de3650642a75e58f61f3b07d8e rpmdevtools-6.8.tar.bz2 +42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 +4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 From e295696f496cafc3c48d34638d8f4b23bb77fc3b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 15 Mar 2015 20:05:33 +0100 Subject: [PATCH 049/107] Revert "Revert wrong merge from EL-6, use rpmdevtools-5.3-2.el5 as base" This reverts commit ac9154dbe16e27e2b078bd3b08275bcc662c0624. --- .gitignore | 4 +- rpmdevtools-5.3-el53-conflict.patch | 12 -- rpmdevtools.spec | 217 ++++++++++++++++++++++++---- sources | 4 +- 4 files changed, 196 insertions(+), 41 deletions(-) delete mode 100644 rpmdevtools-5.3-el53-conflict.patch diff --git a/.gitignore b/.gitignore index b91fbf7..5f6a19e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/spectool-1.0.8.tar.bz2 -/rpmdevtools-5.3.tar.bz2 +spectool-1.0.10.tar.bz2 +rpmdevtools-6.8.tar.bz2 diff --git a/rpmdevtools-5.3-el53-conflict.patch b/rpmdevtools-5.3-el53-conflict.patch deleted file mode 100644 index 78023e2..0000000 --- a/rpmdevtools-5.3-el53-conflict.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker ---- rpmdevtools-5.3/check-rpaths-worker~ 2006-08-16 01:28:09.000000000 +0300 -+++ rpmdevtools-5.3/check-rpaths-worker 2009-01-01 20:23:06.000000000 +0200 -@@ -63,8 +63,6 @@ function showHint() - * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like - * \$ RPM_BUILD_ROOT= /usr/lib/rpm/check-rpaths - * --* 'check-rpaths' is part of 'rpmdevtools'. --* - ******************************************************************************* - EOF - } diff --git a/rpmdevtools.spec b/rpmdevtools.spec index e2345c6..b895993 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,30 +1,60 @@ -%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define spectool_version 1.0.8 +%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d +%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d +%global spectool_version 1.0.10 Name: rpmdevtools -Version: 5.3 -Release: 2%{?dist} +Version: 6.8 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools -License: GPL -URL: http://fedora.redhat.com/ -Source0: %{name}-%{version}.tar.bz2 +# rpmdev-setuptree is GPLv2, everything else GPLv2+ +License: GPLv2+ and GPLv2 +URL: https://fedorahosted.org/rpmdevtools/ +Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 -# Avoid conflict with EL 5.3 rpm, #466939 -Patch0: %{name}-5.3-el53-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# All build deps for man page generation +BuildRequires: help2man +BuildRequires: %{_bindir}/pod2man +BuildRequires: python +BuildRequires: rpm-python Provides: spectool = %{spectool_version} Provides: fedora-rpmdevtools = %{version} Obsoletes: fedora-rpmdevtools < 5.0 -# Required for tool operations -Requires: rpm-python, python, cpio, sed, perl, wget, file # Minimal RPM build requirements -Requires: rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch -Requires: diffutils, gzip, bzip2, unzip +Requires: bash +Requires: bzip2 +Requires: coreutils +Requires: cpio +Requires: diffutils +Requires: findutils +Requires: gawk +Requires: gcc +Requires: gcc-c++ +Requires: grep +Requires: gzip +Requires: info +Requires: make +Requires: redhat-release +Requires: redhat-rpm-config +Requires: rpm-build >= 4.4.2.1 +Requires: sed +Requires: tar +Requires: unzip +Requires: util-linux +Requires: which +# Additionally required for tool operations +#Requires: cpio +Requires: fakeroot +Requires: file +Requires: perl +Requires: python +Requires: rpm-python >= 4.4.2.2 +#Requires: sed +Requires: wget %description This package contains scripts and (X)Emacs support files to aid in @@ -35,16 +65,17 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs rpmdev-checksig Check package signatures using alternate RPM keyring rpminfo Print information about executables and libraries -rpmdev-md5 Display the md5sum of all files in an RPM +rpmdev-md5/sha* Display checksums of all files in an RPM package file rpmdev-vercmp RPM version comparison checker 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 +...and many more. %prep %setup -q -a 1 -%patch0 -p1 cp -p spectool*/README README.spectool @@ -79,10 +110,6 @@ ln -s rpmdev-wipetree $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree ln -s rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo -%check -make check - - %clean rm -rf $RPM_BUILD_ROOT @@ -116,15 +143,155 @@ fi %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_datadir}/rpmdevtools/ -%{_bindir}/* -%{_prefix}/lib/rpm/check-* +%{_bindir}/fedora-* +%{_bindir}/rpm* +%{_bindir}/spectool %ghost %{_datadir}/*emacs -%{_mandir}/man?/*.* +%{_mandir}/man[18]/rpm*.[18]* %changelog -* Thu Jan 1 2009 Ville Skyttä - 5.3-2 -- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen). +* Fri Apr 3 2009 Ville Skyttä - 6.8-1 +- 6.8. + +* Sun Feb 22 2009 Ville Skyttä +- Use %%global instead of %%define in spec templates. +- Handle %%global in addition to %%define in rpmdev-bumpspec. + +* Mon Jan 26 2009 Ville Skyttä +- Add result dependent exit statuses to rpmdev-vercmp. + +* Fri Dec 26 2008 Ville Skyttä +- Add minimum version to rpm-python dependency (for rpmdev-bumpspec). +- Add man page for rpmdev-newspec. + +* Tue Dec 16 2008 Ville Skyttä +- Add imake and intltool to internal list of devel packages in rmdevelrpms. + +* Sat Dec 13 2008 Ville Skyttä +- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). + +* Wed Nov 26 2008 Ville Skyttä +- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms + (#472641, Michael Schwendt). + +* Mon Oct 13 2008 Ville Skyttä +- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). + +* Fri Sep 26 2008 Ville Skyttä +- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). +- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's + user string. + +* Thu Sep 25 2008 Ville Skyttä +- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). + +* Sun Sep 7 2008 Ville Skyttä +- Improve arch specific %%files in perl spec template (#461177, Chris Weyl). + +* Sun Aug 3 2008 Ville Skyttä - 6.7-1 +- 6.7. +- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. + +* Sat Apr 26 2008 Ville Skyttä +- Make rpmls work with URLs. + +* Sun Apr 20 2008 Ville Skyttä +- Include rpm arch in dir names created by rpmdev-extract (#443266). + +* Fri Apr 18 2008 Ville Skyttä +- Remove duplicate "reload" from case block in init script template. +- Fix exit status of "reload" in case service is not running in init + script template (#442993). + +* Thu Mar 27 2008 Ville Skyttä - 6.6-1 +- Fix man page generation. + +* Wed Mar 26 2008 Ville Skyttä - 6.5-1 +- 6.5. + +* Sun Mar 23 2008 Ville Skyttä +- Generate man pages at build time. + +* Sat Mar 22 2008 Ville Skyttä +- Remove libgcj-devel and zlib-devel from rmdevelrpms' internal exclusion + list, they're not essential on non-devel systems any more. + +* Mon Mar 17 2008 Ville Skyttä +- Include ocaml spec template. + +* Tue Mar 11 2008 Ville Skyttä +- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec). + +* Tue Feb 12 2008 Ville Skyttä +- Sync with qa-robot upstream. +- Update spectool to 1.0.10. + +* Sun Feb 3 2008 Ville Skyttä +- Add support for 7-zip, lzma and lzo in rpmdev-extract. + +* Fri Feb 1 2008 Ville Skyttä +- Add ';;' to the init script template's reload action. + +* Sat Dec 8 2007 Ville Skyttä +- Add option to use macro style instead of shell style variables to newspec. +- Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in + rmdevelrpms. + +* Fri Oct 12 2007 Lubomir Kundrak - 6.4-1 +- Import the previous fix into CVS to resync, bump version + +* Fri Oct 12 2007 Lubomir Kundrak - 6.3-1 +- Fix paths in qa-robot tools + +* Sat Sep 8 2007 Ville Skyttä - 6.2-1 +- Sync deps with Fedora's new "assumed present in buildroots" packages list. + +* Thu Sep 6 2007 Ville Skyttä +- Init script template cleanups. + +* Tue Aug 28 2007 Ville Skyttä +- Update rpminfo to version 2004-07-07-02. + +* Fri Aug 10 2007 Ville Skyttä - 6.1-1 +- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +* Mon Aug 6 2007 Ville Skyttä +- Work around #250990 in rpmls and rpmdev-extract. +- Clarify copyright info of rpmdev-* and rpmls. + +* Sat Jul 7 2007 Ville Skyttä +- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2. +- The long form of the list option in rmdevelrpms is --list-only, not --list. + +* Thu Jul 5 2007 Ville Skyttä - 6.0-1 +- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. +- Drop explicit dependency on patch, pulled in by recent rpm-build. +- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms. +- Add LSB comment block to init script template. + +* Wed Jun 27 2007 Ville Skyttä +- Add 2-argument form for comparing EVR strings to rpmdev-vercmp + (available only if rpmUtils.miscutils is available). + +* Sat Jun 16 2007 Ville Skyttä +- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, + rpmsoname) from ALT Linux's qa-robot package. +- Include rpmls (#213778). + +* Fri Jun 15 2007 Ville Skyttä +- Update spectool to 1.0.9 (#243731). + +* Wed Apr 11 2007 Ville Skyttä +- Add --list-only option to rmdevelrpms (Thorsten Leemhuis). + +* Tue Mar 13 2007 Ville Skyttä +- BR perl(ExtUtils::MakeMaker) by default in perl spec template. +- Update URL. + +* Wed Nov 8 2006 Ville Skyttä +- Arch-qualify output of matched packages in rmdevelrpms and allow + arch-qualified packages in the config file. * Wed Oct 25 2006 Ville Skyttä - 5.3-1 - Update spectool to 1.0.8, fixes #212108. diff --git a/sources b/sources index cf0385a..68a41fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 -4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 +d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 +32a879de3650642a75e58f61f3b07d8e rpmdevtools-6.8.tar.bz2 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 050/107] 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 051/107] 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 052/107] - 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 053/107] 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 054/107] 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 055/107] 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 056/107] 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 057/107] 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 058/107] 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 059/107] 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 060/107] 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 061/107] 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 062/107] 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 063/107] 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 064/107] - 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 065/107] - 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 066/107] - 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 067/107] - 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 068/107] 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 069/107] 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 070/107] 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 071/107] - 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 072/107] - 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 073/107] - 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 074/107] 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 075/107] 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 076/107] 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 077/107] 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 078/107] - 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 079/107] 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 080/107] 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 081/107] 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 082/107] 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 083/107] 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 084/107] 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 085/107] 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 086/107] - 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 087/107] 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 088/107] 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 089/107] 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 090/107] - 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 091/107] 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 092/107] - 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 093/107] 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 094/107] 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 095/107] 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 096/107] 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 097/107] 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 098/107] 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 099/107] 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 100/107] 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 101/107] 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 102/107] 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 103/107] 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 104/107] 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 105/107] 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 106/107] 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 107/107] 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