- Update to 7.4, fixes #215927 and #466353.

- Patch spectool to make -s and -p to work as documented (Todd Zullinger).

.cvsignore

@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-6.7.tar.bz2
+rpmdevtools-7.4.tar.xz

rpmdevtools.spec

@@ -1,9 +1,9 @@
-%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
+%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:        6.7
+Version:        7.4
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -11,50 +11,32 @@ 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
+Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+Patch0:         spectool-1.0.10-sourcenum.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-# All build deps for man page generation
+# help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python
+BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
-Obsoletes:      fedora-rpmdevtools < 5.0
-# Minimal RPM build requirements
-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:       patch
-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:       findutils
+Requires:       gawk
+Requires:       grep
+Requires:       man
+Requires:       python >= 2.4
+Requires:       rpm-build >= 4.4.2.1
 Requires:       rpm-python
-#Requires:      sed
+Requires:       sed
 Requires:       wget
+# For _get_cword in bash completion snippet
+Conflicts:      bash-completion < 20080705
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -65,7 +47,7 @@ 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 archive 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
@@ -76,7 +58,10 @@ rpmdev-bumpspec     Bump revision in specfile
 
 %prep
 %setup -q -a 1
-cp -p spectool*/README README.spectool
+cp -p spectool-%{spectool_version}/README README.spectool
+cd spectool-%{spectool_version}
+%patch0 -p1
+cd ..
 
 
 %build
@@ -89,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
 
 for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   install -dm 755 $RPM_BUILD_ROOT$dir
@@ -119,16 +104,111 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README*
+%doc COPYING NEWS README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
+%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
-%{_bindir}/rpm*
-%{_bindir}/spectool
+%{_bindir}/*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man[18]/rpm*.[18]*
+%{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* Fri Aug 21 2009 Ville Skyttä <ville.skytta@iki.fi> - 7.4-1
+- Update to 7.4, fixes #215927 and #466353.
+- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 25 2009 Ville Skyttä <ville.skytta at iki.fi> - 7.3-1
+- Release 7.3.
+
+* Sat May 23 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add rpmdev-packager - script for getting rpm packager info.
+- Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el.
+- Fix rpmdev-extract MIME type comparisons with file(1) output containing
+  parameters.
+
+* Wed May 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 7.2-1
+- Release 7.2.
+
+* Sun May  3 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add dummy spec template for ad-hoc testing.
+
+* Sat May  2 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Improve newspec/newinit when only "-o foo" argument is given (#498588,
+  thanks to Edwin ten Brink).
+- Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert
+  if rpm-spec-user-mail-address is not set.
+- Add xz support to rpmdev-extract.
+
+* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Make bumpspec's use of "head" POSIX compliant.
+
+* Thu Apr 16 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add rpmdev-newinit for easier access to the init script template, move the
+  template to %%{_sysconfdir}/rpmdevtools, improve reload action example.
+
+* Tue Apr  7 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Speed up rpmls bash completion.
+
+* Sat Apr  4 2009 Ville Skyttä <ville.skytta at iki.fi> - 7.1-1
+- 7.1.
+- Make rpmdev-md5 and friends work on non-srpm package files too.
+
+* Sun Mar 15 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add bash completion.
+
+* Mon Mar  9 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add query format option to rmdevelrpms, sort output by NEVRA.
+
+* Sun Feb 22 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Use %%global instead of %%define in spec templates.
+- Handle %%global in addition to %%define in rpmdev-bumpspec.
+
+* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Add result dependent exit statuses to rpmdev-vercmp.
+
+* Fri Dec 26 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
+
+* Fri Dec 26 2008 Ville Skyttä <ville.skytta at iki.fi> - 7.0-1
+- 7.0.
+- Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055).
+- Add man page for rpmdev-newspec.
+
+* Tue Dec 16 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Add imake and intltool to internal list of devel packages in rmdevelrpms.
+
+* Sat Dec 13 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
+
+* Wed Nov 26 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
+  (#472641, Michael Schwendt).
+
+* Thu Nov 20 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Drop "minimal buildroot" dependencies.
+- Drop fedora-rpmdevtools Obsoletes.
+
+* Mon Oct 13 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
+
+* Fri Sep 26 2008 Ville Skyttä <ville.skytta at iki.fi>
+- 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ä <ville.skytta at iki.fi>
+- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
+
+* Mon Sep 22 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Switch to lzma compressed tarball.
+
+* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
+
 * Sun Aug  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 6.7-1
 - 6.7.
 - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.

sources

@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-819ece90d6be10c4ed85cc4a6975589c  rpmdevtools-6.7.tar.bz2
+8407f2e7f2037ec28ca7910fed2c3498  rpmdevtools-7.4.tar.xz

spectool-1.0.10-sourcenum.patch

@@ -0,0 +1,17 @@
+Fix for -s x,y, -p x,y from Todd Zullinger:
+https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html
+
+diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
+--- spectool-1.0.10/spectool~	2008-02-12 12:32:21.000000000 +0200
++++ spectool-1.0.10/spectool	2009-08-21 02:12:56.000000000 +0300
+@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
+ 			'v|verbose' => sub { $verbose++; },
+ 			'n|dryrun|dry-run' => sub { $dryrun = 1; },
+ 			'V|version' => sub { $command = 'version'; },
+-			's|source=i' => \@sources,
+-			'p|patch=i' => \@patches,
++			's|source=s' => \@sources,
++			'p|patch=s' => \@patches,
+ 			'S|sources' => sub { push @what, 'sources'; },
+ 			'P|patches' => sub { push @what, 'patches'; },
+ 			'A|all' => sub { push @what, 'all'; },