From d1b2bdf0f1bc25d4e54e4660a0f71afdc4103650 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Aug 13 2007 08:25:52 +0000
Subject: - 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.

---

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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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