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