From f581eed22111c3ee69ce3f4ccb0f832df72e64ba Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 09:34:52 +0000 Subject: [PATCH 1/6] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From b6c03db9bf3a316d4e957400ae245665c7d8bee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 7 Jul 2007 10:38:38 +0000 Subject: [PATCH 2/6] =?UTF-8?q?-=20Fix=20Epoch=20handling=20in=20the=202-a?= =?UTF-8?q?rg=20form=20of=20rpmdev-vercmp=20with=20yum=20<=203.1.2.=20-=20?= =?UTF-8?q?The=20long=20form=20of=20the=20list=20option=20in=20rmdevelrpms?= =?UTF-8?q?=20is=20--list-only,=20not=20=20=20=20=20--list.=20Thu=20Jul=20?= =?UTF-8?q?5=202007=20Ville=20Skytt=C3=A4=20?= =?UTF-8?q?=20-=20Add=20cmake=20and=20scons=20to=20default=20devel=20packa?= =?UTF-8?q?ge=20list=20in=20rpmdev-rmdevelrpms.=20-=20Add=20LSB=20comment?= =?UTF-8?q?=20block=20to=20init=20script=20template.=20Wed=20Jun=2027=2020?= =?UTF-8?q?07=20Ville=20Skytt=C3=A4=20=20-=20A?= =?UTF-8?q?dd=202-argument=20form=20for=20comparing=20EVR=20strings=20to?= =?UTF-8?q?=20rpmdev-vercmp=20(available=20=20=20=20=20only=20if=20rpmUtil?= =?UTF-8?q?s.miscutils=20is=20available).=20Sat=20Jun=2016=202007=20Ville?= =?UTF-8?q?=20Skytt=C3=A4=20=20-=20Include=20r?= =?UTF-8?q?pmls=20(#213778).=20Fri=20Jun=2015=202007=20Ville=20Skytt=C3=A4?= =?UTF-8?q?=20=20-=20Update=20spectool=20to=20?= =?UTF-8?q?1.0.9=20(#243731).=20Wed=20Apr=2011=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=20Add=20--list-only?= =?UTF-8?q?=20option=20to=20rmdevelrpms=20(Thorsten=20Leemhuis).=20Tue=20M?= =?UTF-8?q?ar=2013=202007=20Ville=20Skytt=C3=A4=20=20-=20BR=20perl(ExtUtils::MakeMaker)=20by=20default=20in?= =?UTF-8?q?=20perl=20spec=20template.=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 | 58 ++++++++++++++++++++++++++++++++++++++++++------ sources | 4 ++-- 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7076111..3a1b138 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-5.3.tar.bz2 -spectool-1.0.8.tar.bz2 +rpmdevtools-5.4.tar.bz2 +spectool-1.0.9.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a76e961..d84e2c7 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,15 +1,15 @@ %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: 5.4 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) @@ -19,10 +19,25 @@ 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 # Minimal RPM build requirements -Requires: rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch -Requires: diffutils, gzip, bzip2, unzip +Requires: rpm-build +Requires: gcc +Requires: gcc-c++ +Requires: redhat-rpm-config +Requires: make +Requires: tar +Requires: patch +Requires: diffutils +Requires: gzip +Requires: bzip2 +Requires: unzip %description This package contains scripts and (X)Emacs support files to aid in @@ -116,10 +131,39 @@ fi %{_bindir}/* %{_prefix}/lib/rpm/check-* %ghost %{_datadir}/*emacs -%{_mandir}/man?/*.* +%{_mandir}/man[18]/rpm*.[18]* %changelog +* Sat Jul 7 2007 Ville Skyttä - 5.4-1 +- 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ä +- 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 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..fdea5a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 -42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 +fe7e91079b7a317f531881ce0f205594 rpmdevtools-5.4.tar.bz2 +b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 From d1b2bdf0f1bc25d4e54e4660a0f71afdc4103650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 13 Aug 2007 08:25:52 +0000 Subject: [PATCH 3/6] - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. - Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, rpmsoname) from ALT Linux's qa-robot package. - Drop explicit dependency on patch, pulled in by recent rpm-build. - Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - Work around #250990 in rpmls and rpmdev-extract. - Clarify copyright info of rpmdev-* and rpmls. --- .cvsignore | 2 +- rpmdevtools.spec | 33 ++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a1b138..13c425e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-5.4.tar.bz2 spectool-1.0.9.tar.bz2 +rpmdevtools-6.1.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index d84e2c7..f628f6b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,12 +3,16 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 5.4 -Release: 1%{?dist} +Version: 6.1 +# 0.x series is vanilla rpmdevtools 6.x except that it includes the +# fedora-rpmdevtools backwards compatibility features dropped in vanilla +# 6.x versions. 0.x series is intended to be shipped for Fedora <= 7 only. +Release: 0.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 @@ -26,14 +30,14 @@ Requires: sed Requires: perl Requires: wget Requires: file +Requires: fakeroot # Minimal RPM build requirements -Requires: rpm-build +Requires: rpm-build >= 4.4.2.1 Requires: gcc Requires: gcc-c++ Requires: redhat-rpm-config Requires: make Requires: tar -Requires: patch Requires: diffutils Requires: gzip Requires: bzip2 @@ -53,6 +57,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 @@ -91,10 +96,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 @@ -128,13 +129,23 @@ 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[18]/rpm*.[18]* %changelog +* Mon Aug 13 2007 Ville Skyttä - 6.1-0.1 +- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. +- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, + rpmsoname) from ALT Linux's qa-robot package. +- Drop explicit dependency on patch, pulled in by recent rpm-build. +- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +- Work around #250990 in rpmls and rpmdev-extract. +- Clarify copyright info of rpmdev-* and rpmls. + * Sat Jul 7 2007 Ville Skyttä - 5.4-1 - 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. diff --git a/sources b/sources index fdea5a1..5c7ff48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fe7e91079b7a317f531881ce0f205594 rpmdevtools-5.4.tar.bz2 b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 +3d5e2747d1955bb902127b4d9ded30a0 rpmdevtools-6.1.tar.bz2 From d14c601642a088e690897b848ac217d55132a1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 1 Nov 2007 18:49:41 +0000 Subject: [PATCH 4/6] - Update to 6.4: - Fix paths in qa-robot tools (#361831, Lubomir Kundrak). - Sync deps with Fedora's new "assumed present in buildroots" packages list. - Init script template cleanups. - Update rpminfo to version 2004-07-07-02. --- .cvsignore | 2 +- rpmdevtools.spec | 51 +++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 13c425e..526bb61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.9.tar.bz2 -rpmdevtools-6.1.tar.bz2 +rpmdevtools-6.4.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index f628f6b..c02dae3 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.9 Name: rpmdevtools -Version: 6.1 +Version: 6.4 # 0.x series is vanilla rpmdevtools 6.x except that it includes the # fedora-rpmdevtools backwards compatibility features dropped in vanilla # 6.x versions. 0.x series is intended to be shipped for Fedora <= 7 only. @@ -22,26 +22,38 @@ BuildArch: noarch Provides: spectool = %{spectool_version} Provides: fedora-rpmdevtools = %{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 @@ -137,6 +149,13 @@ fi %changelog +* Thu Nov 1 2007 Ville Skyttä - 6.4-0.1 +- Update to 6.4: +- Fix paths in qa-robot tools (#361831, Lubomir Kundrak). +- Sync deps with Fedora's new "assumed present in buildroots" packages list. +- Init script template cleanups. +- Update rpminfo to version 2004-07-07-02. + * Mon Aug 13 2007 Ville Skyttä - 6.1-0.1 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1. - Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek, diff --git a/sources b/sources index 5c7ff48..94bcc61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 -3d5e2747d1955bb902127b4d9ded30a0 rpmdevtools-6.1.tar.bz2 +52c257170fb8de032196f04859bdee2c rpmdevtools-6.4.tar.bz2 From bb3428d95f352f383d898350a5a8012faa23b854 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:16 +0000 Subject: [PATCH 5/6] 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 1a6f3308523e8d34bdd2bf7724f5905c9dba65c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:20 +0000 Subject: [PATCH 6/6] 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 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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7