Update for compatibility with rpm-build >= 4.4.2.1 (ouch, a surprise FC-6

update)

.cvsignore

@@ -1,2 +1,2 @@
 spectool-1.0.9.tar.bz2
-rpmdevtools-6.4.tar.bz2
+rpmdevtools-6.1.tar.bz2

branch

@@ -0,0 +1 @@
+FC-6

rpmdevtools.spec

@@ -3,8 +3,11 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.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
@@ -17,39 +20,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
+Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Minimal RPM build requirements
-Requires:       bash
-Requires:       bzip2
-Requires:       coreutils
+# Required for tool operations
+Requires:       rpm-python
+Requires:       python
 Requires:       cpio
-Requires:       diffutils
-Requires:       findutils
-Requires:       gawk
+Requires:       sed
+Requires:       perl
+Requires:       wget
+Requires:       file
+Requires:       fakeroot
+# Minimal RPM build requirements
+Requires:       rpm-build >= 4.4.2.1
 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:       make
 Requires:       tar
+Requires:       diffutils
+Requires:       gzip
+Requires:       bzip2
 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
-#Requires:      sed
-Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -91,11 +83,32 @@ for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
+# Backwards compatibility symlinks
+ln -s rpmdev-checksig    $RPM_BUILD_ROOT%{_bindir}/fedora-rpmchecksig
+ln -s rpmdev-diff        $RPM_BUILD_ROOT%{_bindir}/fedora-diffarchive
+ln -s rpmdev-extract     $RPM_BUILD_ROOT%{_bindir}/fedora-extract
+ln -s rpmdev-md5         $RPM_BUILD_ROOT%{_bindir}/fedora-md5
+ln -s rpmdev-newspec     $RPM_BUILD_ROOT%{_bindir}/fedora-newrpmspec
+ln -s rpmdev-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}/fedora-rmdevelrpms
+ln -s rpmdev-setuptree   $RPM_BUILD_ROOT%{_bindir}/fedora-buildrpmtree
+ln -s rpmdev-vercmp      $RPM_BUILD_ROOT%{_bindir}/fedora-rpmvercmp
+ln -s rpmdev-wipetree    $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree
+ln -s rpminfo            $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+# Upgrade from fedora-rpmdevtools:
+oldconf=%{_sysconfdir}/fedora/rmdevelrpms.conf
+if [ $1 -eq 1 -a -f $oldconf ] ; then
+  echo "5615a64d80f6e6b4df77b3ab0ef1469c  $oldconf" \
+  | md5sum -c --status - >/dev/null 2>&1 || \
+  cat $oldconf > %{_sysconfdir}/rpmdevtools/rmdevelrpms.conf || :
+fi
+
 %triggerin -- emacs-common
 [ -d %{emacs_sitestart_d} ] && \
   ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
@@ -116,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_datadir}/rpmdevtools/
+%{_bindir}/fedora-*
 %{_bindir}/rpm*
 %{_bindir}/spectool
 %ghost %{_datadir}/*emacs
@@ -123,35 +137,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 12 2007 Lubomir Kundrak <lkundrak@redhat.com> - 6.4-1
-- Import the previous fix into CVS to resync, bump version
-
-* Fri Oct 12 2007 Lubomir Kundrak <lkundrak@redhat.com> - 6.3-1
-- Fix paths in qa-robot tools
-
-* Sat Sep  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.2-1
-- Sync deps with Fedora's new "assumed present in buildroots" packages list.
-
-* Thu Sep  6 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Init script template cleanups.
-
-* Tue Aug 28 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Update rpminfo to version 2004-07-07-02.
-
-* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.1-1
+* 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
-
-* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi>
 - 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>
+* 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.
 
-* Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 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.
+* Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
 - Add LSB comment block to init script template.
 
@@ -160,8 +159,6 @@ rm -rf $RPM_BUILD_ROOT
   (available only if rpmUtils.miscutils is available).
 
 * Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
-- 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ä <ville.skytta at iki.fi>
@@ -172,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT
 
 * Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
 - BR perl(ExtUtils::MakeMaker) by default in perl spec template.
-- Drop deprecated backwards compatibility with fedora-rpmdevtools.
 - Update URL.
 
 * Wed Nov  8 2006 Ville Skyttä <ville.skytta at iki.fi>

sources

@@ -1,2 +1,2 @@
 b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
-52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2
+3d5e2747d1955bb902127b4d9ded30a0  rpmdevtools-6.1.tar.bz2