- Update to 6.4:

- Fix paths in qa-robot tools (#361831, Lubomir Kundrak).
- Sync deps with Fedora's new "assumed present in buildroots" packages
    list.
- Init script template cleanups.
- Update rpminfo to version 2004-07-07-02.

.cvsignore

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

branch

@@ -0,0 +1 @@
+F-7

rpmdevtools.spec

@@ -1,27 +1,26 @@
 %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.10
+%define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.6
-Release:        1%{?dist}
+Version:        6.4
+# 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
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
-URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        http://scop.fedorapeople.org/rpmdevtools/%{name}-%{version}.tar.bz2
+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)
 
 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
 # Minimal RPM build requirements
 Requires:       bash
@@ -70,7 +69,6 @@ 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.
 
 
@@ -97,11 +95,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} || :
@@ -122,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_datadir}/rpmdevtools/
+%{_bindir}/fedora-*
 %{_bindir}/rpm*
 %{_bindir}/spectool
 %ghost %{_datadir}/*emacs
@@ -129,70 +149,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Mar 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 6.6-1
-- Fix man page generation.
-
-* Wed Mar 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 6.5-1
-- 6.5.
-
-* Sun Mar 23 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Generate man pages at build time.
-
-* Sat Mar 22 2008 Ville Skyttä <ville.skytta at iki.fi>
-- 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ä <ville.skytta at iki.fi>
-- Include ocaml spec template.
-
-* Tue Mar 11 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).
-
-* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Sync with qa-robot upstream.
-- Update spectool to 1.0.10.
-
-* Sun Feb  3 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add support for 7-zip, lzma and lzo in rpmdev-extract.
-
-* Fri Feb  1 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add ';;' to the init script template's reload action.
-
-* Sat Dec  8 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Add fonts spec template from the Fedora Fonts SIG (#407781).
-- 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 <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
+* Thu Nov  1 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.4-0.1
+- Update to 6.4:
+- Fix paths in qa-robot tools (#361831, Lubomir Kundrak).
 - 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.
 
@@ -201,8 +178,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>
@@ -213,7 +188,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 @@
-d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-7bcf7bdb6071b4f19c86435e667ca3e4  rpmdevtools-6.6.tar.bz2
+b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
+52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2