From f4b24c88d725fda53b463322ef0fa9e51b6af2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 27 Aug 2007 20:37:49 +0000 Subject: [PATCH] Update for compatibility with rpm-build >= 4.4.2.1 (ouch, a surprise FC-6 update) --- .cvsignore | 4 +-- rpmdevtools.spec | 85 +++++++++++++++++++++++++++++++++++++++--------- sources | 4 +-- 3 files changed, 74 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7076111..13c425e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -rpmdevtools-5.3.tar.bz2 -spectool-1.0.8.tar.bz2 +spectool-1.0.9.tar.bz2 +rpmdevtools-6.1.tar.bz2 diff --git a/rpmdevtools.spec b/rpmdevtools.spec index a76e961..f628f6b 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,15 +1,19 @@ %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 -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 -URL: http://fedora.redhat.com/ +# 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,10 +23,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 +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 +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 @@ -76,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 @@ -113,13 +129,52 @@ 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 +* 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. + +* 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..5c7ff48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4d2cd5398dfe75f2bfd96e9ecd9b46c1 rpmdevtools-5.3.tar.bz2 -42534ac977cd85df810a4450152543ec spectool-1.0.8.tar.bz2 +b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2 +3d5e2747d1955bb902127b4d9ded30a0 rpmdevtools-6.1.tar.bz2