From b04778d8e9889abb5021a9ff18a9f2437c0dc975 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 18:42:19 +0000 Subject: [PATCH 1/5] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 2e2ef762c3100d700f8b9495f59c1572f412fabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 3 Aug 2008 10:03:09 +0000 Subject: [PATCH 2/5] =?UTF-8?q?-=206.7.=20-=20Make=20rpmdev-diff,=20rpmdev?= =?UTF-8?q?-md5=20and=20rpminfo=20honor=20TMPDIR.=20Sat=20Apr=2026=202008?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=20Mak?= =?UTF-8?q?e=20rpmls=20work=20with=20URLs.=20Sun=20Apr=2020=202008=20Ville?= =?UTF-8?q?=20Skytt=C3=A4=20=20-=20Include=20r?= =?UTF-8?q?pm=20arch=20in=20dir=20names=20created=20by=20rpmdev-extract=20?= =?UTF-8?q?(#443266).=20Fri=20Apr=2018=202008=20Ville=20Skytt=C3=A4=20=20-=20Remove=20duplicate=20"reload"=20?= =?UTF-8?q?from=20case=20block=20in=20init=20script=20template.=20-=20Fix?= =?UTF-8?q?=20exit=20status=20of=20"reload"=20in=20case=20service=20is=20n?= =?UTF-8?q?ot=20running=20in=20init=20script=20=20=20=20=20template=20(#44?= =?UTF-8?q?2993).?= 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 12b366ed3f9f3e302fb15e4c9d7d1bff14f0ea3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 26 Dec 2008 12:17:56 +0000 Subject: [PATCH 3/5] =?UTF-8?q?-=207.0.=20-=20Drop=20fonts=20spec=20templa?= =?UTF-8?q?te,=20adapt=20to=20new=20ones=20from=20Fedora=20fonts=20SIG=20?= =?UTF-8?q?=20=20=20=20(#477055).=20-=20Add=20man=20page=20for=20rpmdev-ne?= =?UTF-8?q?wspec.=20Tue=20Dec=2016=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20imake=20and=20intltool=20to=20?= =?UTF-8?q?internal=20list=20of=20devel=20packages=20in=20rmdevelrpms.=20S?= =?UTF-8?q?at=20Dec=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-sha*/*sum=20companions=20to=20rpm?= =?UTF-8?q?dev-md5=20(ticket=20#7).=20Wed=20Nov=2026=202008=20Ville=20Skyt?= =?UTF-8?q?t=C3=A4=20=20-=20Add=20vamp-plugin-?= =?UTF-8?q?sdk=20to=20internal=20list=20of=20non-devel=20packages=20in=20r?= =?UTF-8?q?mdevelrpms=20=20=20=20=20(#472641,=20Michael=20Schwendt).=20Thu?= =?UTF-8?q?=20Nov=2020=202008=20Ville=20Skytt=C3=A4=20=20-=20Drop=20"minimal=20buildroot"=20dependencies.?= =?UTF-8?q?=20-=20Drop=20fedora-rpmdevtools=20Obsoletes.=20Mon=20Oct=2013?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Show=20available=20types=20in=20rpmdev-newspec=20--help=20(?= =?UTF-8?q?ticket=20#6,=20Todd=20=20=20=20=20Zullinger).=20Fri=20Sep=2026?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Add=20-r/--rightmost=20option=20to=20rpmdev-bumpspec=20(tic?= =?UTF-8?q?ket=20#1,=20Thorsten=20=20=20=20=20Leemhuis).=20-=20Add=20%pack?= =?UTF-8?q?ager=20from=20rpm=20config=20to=20the=20set=20of=20defaults=20f?= =?UTF-8?q?or=20=20=20=20=20rpmdev-bumpspec's=20user=20string.=20Thu=20Sep?= =?UTF-8?q?=2025=202008=20Ville=20Skytt=C3=A4=20=20-=20Bring=20rpmdev-bumpspec=20copyright=20holder=20closer?= =?UTF-8?q?=20to=20truth=20(Michael=20=20=20=20=20Schwendt).=20Mon=20Sep?= =?UTF-8?q?=2022=202008=20Ville=20Skytt=C3=A4=20=20-=20Switch=20to=20lzma=20compressed=20tarball.=20Sun=20Sep?= =?UTF-8?q?=207=202008=20Ville=20Skytt=C3=A4=20=20-=20Improve=20arch=20specific=20%files=20in=20perl=20spec?= =?UTF-8?q?=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 4f46771124e462130d9027da634c8ac7804f858f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:17 +0000 Subject: [PATCH 4/5] 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 a700fc3c2ed5f8056d707d5a724dcc42c5e31427 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:32 +0000 Subject: [PATCH 5/5] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9