From eda72d9a7df499a46e5529977abc456c7f4bb53f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 4 Nov 2006 18:50:01 +0000 Subject: [PATCH 1/7] 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 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 2/7] - 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 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 3/7] =?UTF-8?q?-=206.8.=20Sun=20Feb=2022=202009=20Ville=20?= =?UTF-8?q?Skytt=C3=A4=20=20-=20Use=20%%global?= =?UTF-8?q?=20instead=20of=20%%define=20in=20spec=20templates.=20-=20Handl?= =?UTF-8?q?e=20%%global=20in=20addition=20to=20%%define=20in=20rpmdev-bump?= =?UTF-8?q?spec.=20Mon=20Jan=2026=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20result=20dependent=20exit=20sta?= =?UTF-8?q?tuses=20to=20rpmdev-vercmp.=20Fri=20Dec=2026=202008=20Ville=20S?= =?UTF-8?q?kytt=C3=A4=20=20-=20Add=20minimum?= =?UTF-8?q?=20version=20to=20rpm-python=20dependency=20(for=20rpmdev-bumps?= =?UTF-8?q?pec).=20-=20Add=20man=20page=20for=20rpmdev-newspec.=20Tue=20De?= =?UTF-8?q?c=2016=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20imake=20and=20intltool=20to=20internal=20list?= =?UTF-8?q?=20of=20devel=20packages=20in=20rmdevelrpms.=20Sat=20Dec=2013?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Add=20rpmdev-sha*/*sum=20companions=20to=20rpmdev-md5=20(ti?= =?UTF-8?q?cket=20#7).=20Wed=20Nov=2026=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20vamp-plugin-sdk=20to=20in?= =?UTF-8?q?ternal=20list=20of=20non-devel=20packages=20in=20rmdevelrpms=20?= =?UTF-8?q?=20=20=20=20(#472641,=20Michael=20Schwendt).=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%%pac?= =?UTF-8?q?kager=20from=20rpm=20config=20to=20the=20set=20of=20defaults=20?= =?UTF-8?q?for=20=20=20=20=20rpmdev-bumpspec's=20user=20string.=20Thu=20Se?= =?UTF-8?q?p=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).=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=20=20=20=20=20Weyl).=20Sun=20Au?= =?UTF-8?q?g=203=202008=20Ville=20Skytt=C3=A4=20=20-=206.7-1=20-=206.7.=20-=20Make=20rpmdev-diff,=20rpmdev-md?= =?UTF-8?q?5=20and=20rpminfo=20honor=20TMPDIR.=20Sat=20Apr=2026=202008=20V?= =?UTF-8?q?ille=20Skytt=C3=A4=20=20-=20Make=20?= =?UTF-8?q?rpmls=20work=20with=20URLs.=20Sun=20Apr=2020=202008=20Ville=20S?= =?UTF-8?q?kytt=C3=A4=20=20-=20Include=20rpm?= =?UTF-8?q?=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"=20fr?= =?UTF-8?q?om=20case=20block=20in=20init=20script=20template.=20-=20Fix=20?= =?UTF-8?q?exit=20status=20of=20"reload"=20in=20case=20service=20is=20not?= =?UTF-8?q?=20running=20in=20init=20script=20=20=20=20=20template=20(#4429?= =?UTF-8?q?93).=20Thu=20Mar=2027=202008=20Ville=20Skytt=C3=A4=20=20-=206.6-1=20-=20Fix=20man=20page=20generat?= =?UTF-8?q?ion.=20Wed=20Mar=2026=202008=20Ville=20Skytt=C3=A4=20=20-=206.5-1=20-=206.5.=20Sun=20Mar=2023=2020?= =?UTF-8?q?08=20Ville=20Skytt=C3=A4=20=20-=20G?= =?UTF-8?q?enerate=20man=20pages=20at=20build=20time.=20Sat=20Mar=2022=202?= =?UTF-8?q?008=20Ville=20Skytt=C3=A4=20=20-=20?= =?UTF-8?q?Remove=20libgcj-devel=20and=20zlib-devel=20from=20rmdevelrpms'?= =?UTF-8?q?=20internal=20exclusion=20=20=20=20=20list,=20they're=20not=20e?= =?UTF-8?q?ssential=20on=20non-devel=20systems=20any=20more.=20Mon=20Mar?= =?UTF-8?q?=2017=202008=20Ville=20Skytt=C3=A4=20=20-=20Include=20ocaml=20spec=20template.=20Tue=20Mar=2011=20?= =?UTF-8?q?2008=20Ville=20Skytt=C3=A4=20=20-?= =?UTF-8?q?=20Include=20Michael=20Schwendt's=20bumpspecfile.py=20(as=20rpm?= =?UTF-8?q?dev-bumpspec).=20Tue=20Feb=2012=202008=20Ville=20Skytt=C3=A4=20?= =?UTF-8?q?=20-=20Sync=20with=20qa-robot=20ups?= =?UTF-8?q?tream.=20-=20Update=20spectool=20to=201.0.10.=20Sun=20Feb=203?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Add=20support=20for=207-zip,=20lzma=20and=20lzo=20in=20rpmd?= =?UTF-8?q?ev-extract.=20Fri=20Feb=201=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20';;'=20to=20the=20init=20s?= =?UTF-8?q?cript=20template's=20reload=20action.=20Sat=20Dec=208=202007=20?= =?UTF-8?q?Ville=20Skytt=C3=A4=20=20-=20Add=20?= =?UTF-8?q?option=20to=20use=20macro=20style=20instead=20of=20shell=20styl?= =?UTF-8?q?e=20variables=20to=20=20=20=20=20newspec.=20-=20Prefer=20~/.con?= =?UTF-8?q?fig/rpmdevtools/rmdevelrpms.conf=20over=20~/.rmdevelrpmsrc=20in?= =?UTF-8?q?=20=20=20=20=20rmdevelrpms.=20Fri=20Oct=2012=202007=20Lubomir?= =?UTF-8?q?=20Kundrak=20=20-=206.4-1=20-=20Import=20t?= =?UTF-8?q?he=20previous=20fix=20into=20CVS=20to=20resync,=20bump=20versio?= =?UTF-8?q?n=20Fri=20Oct=2012=202007=20Lubomir=20Kundrak=20=20-=206.3-1=20-=20Fix=20paths=20in=20qa-robot=20tools=20?= =?UTF-8?q?Sat=20Sep=208=202007=20Ville=20Skytt=C3=A4=20=20-=206.2-1=20-=20Sync=20deps=20with=20Fedora's=20ne?= =?UTF-8?q?w=20"assumed=20present=20in=20buildroots"=20packages=20=20=20?= =?UTF-8?q?=20=20list.=20Thu=20Sep=206=202007=20Ville=20Skytt=C3=A4=20=20-=20Init=20script=20template=20clean?= =?UTF-8?q?ups.=20Tue=20Aug=2028=202007=20Ville=20Skytt=C3=A4=20=20-=20Update=20rpminfo=20to=20version=202004?= =?UTF-8?q?-07-07-02.=20Fri=20Aug=2010=202007=20Ville=20Skytt=C3=A4=20=20-=206.1-1=20-=20Sync=20COPYING=20wit?= =?UTF-8?q?h=20http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt=20Mon?= =?UTF-8?q?=20Aug=206=202007=20Ville=20Skytt=C3=A4=20=20-=20Work=20around=20#250990=20in=20rpmls=20and=20rpmd?= =?UTF-8?q?ev-extract.=20-=20Clarify=20copyright=20info=20of=20rpmdev-*=20?= =?UTF-8?q?and=20rpmls.=20Sat=20Jul=207=202007=20Ville=20Skytt=C3=A4=20=20-=20Fix=20Epoch=20handling=20in=20t?= =?UTF-8?q?he=202-arg=20form=20of=20rpmdev-vercmp=20with=20yum=20<=203.1.2?= =?UTF-8?q?.=20-=20The=20long=20form=20of=20the=20list=20option=20in=20rmd?= =?UTF-8?q?evelrpms=20is=20--list-only,=20not=20=20=20=20=20--list.=20Thu?= =?UTF-8?q?=20Jul=205=202007=20Ville=20Skytt=C3=A4=20=20-=206.0-1=20-=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-=20Update=20URL.=20Wed=20Nov=208=202006=20Ville=20Sk?= =?UTF-8?q?ytt=C3=A4=20=20-=20Arch-qualify=20o?= =?UTF-8?q?utput=20of=20matched=20packages=20in=20rmdevelrpms=20and=20allo?= =?UTF-8?q?w=20=20=20=20=20arch-qualified=20packages=20in=20the=20config?= =?UTF-8?q?=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 4ada163a7d3b30e44896cb49a53986dac758b8d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:16 +0000 Subject: [PATCH 4/7] 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 82436c4ab4b21dd17006dc309343f5bf95390afc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:28 +0000 Subject: [PATCH 5/7] 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 ac9154dbe16e27e2b078bd3b08275bcc662c0624 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 15 Mar 2015 20:02:53 +0100 Subject: [PATCH 6/7] 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 7/7] 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