- Update to 7.5, fixes #502403.

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

.cvsignore

@@ -1,2 +1,2 @@
-rpmdevtools-5.0.tar.bz2
+spectool-1.0.10.tar.bz2
-spectool-1.0.7.tar.bz2
+rpmdevtools-7.5.tar.xz

rpmdevtools.spec

@@ -1,28 +1,42 @@
-%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
+%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        5.0
+Version:        7.5
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
-URL:            http://fedora.redhat.com/
+License:        GPLv2+ and GPLv2
-Source0:        %{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/rpmdevtools/
+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
+# help2man, pod2man, *python for creating man pages
+BuildRequires:  help2man
+BuildRequires:  %{_bindir}/pod2man
+BuildRequires:  python >= 2.4
+BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
-Provides:       fedora-rpmdevtools = %{version}
+Requires:       diffutils
-Obsoletes:      fedora-rpmdevtools < 5.0
+Requires:       fakeroot
-# Required for tool operations
+Requires:       file
-Requires:       rpm-python, python, cpio, sed, perl, wget, file
+Requires:       findutils
-# Minimal RPM build requirements
+Requires:       gawk
-Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
+Requires:       grep
-Requires:       diffutils, gzip, bzip2, unzip
+Requires:       man
+Requires:       python >= 2.4
+Requires:       rpm-build >= 4.4.2.1
+Requires:       rpm-python
+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
@@ -33,16 +47,21 @@ 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
 rpmdev-extract      Extract various archives, "tar xvf" style
+rpmdev-bumpspec     Bump revision in specfile
+...and many more.
 
 
 %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
@@ -55,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
@@ -63,22 +82,6 @@ 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
-
-
-%check
-make check
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,95 +104,313 @@ 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}/*
-%{_prefix}/lib/rpm/check-*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man?/*.*
+%{_mandir}/man[18]/*.[18]*
 
 
 %changelog
-* Sun Aug 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.0-1
+* Thu Sep 17 2009 Ville Skyttä <ville.skytta@iki.fi> - 7.5-1
+- Update to 7.5, fixes #502403.
+
+* 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@iki.fi> - 7.3-1
+- Release 7.3.
+
+* Sat May 23 2009 Ville Skyttä <ville.skytta@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@iki.fi> - 7.2-1
+- Release 7.2.
+
+* Sun May  3 2009 Ville Skyttä <ville.skytta@iki.fi>
+- Add dummy spec template for ad-hoc testing.
+
+* Sat May  2 2009 Ville Skyttä <ville.skytta@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@iki.fi>
+- Make bumpspec's use of "head" POSIX compliant.
+
+* Thu Apr 16 2009 Ville Skyttä <ville.skytta@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@iki.fi>
+- Speed up rpmls bash completion.
+
+* Sat Apr  4 2009 Ville Skyttä <ville.skytta@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@iki.fi>
+- Add bash completion.
+
+* Mon Mar  9 2009 Ville Skyttä <ville.skytta@iki.fi>
+- Add query format option to rmdevelrpms, sort output by NEVRA.
+
+* Sun Feb 22 2009 Ville Skyttä <ville.skytta@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@iki.fi>
+- Add result dependent exit statuses to rpmdev-vercmp.
+
+* Fri Dec 26 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
+
+* Fri Dec 26 2008 Ville Skyttä <ville.skytta@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@iki.fi>
+- Add imake and intltool to internal list of devel packages in rmdevelrpms.
+
+* Sat Dec 13 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
+
+* Wed Nov 26 2008 Ville Skyttä <ville.skytta@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@iki.fi>
+- Drop "minimal buildroot" dependencies.
+- Drop fedora-rpmdevtools Obsoletes.
+
+* Mon Oct 13 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
+
+* Fri Sep 26 2008 Ville Skyttä <ville.skytta@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@iki.fi>
+- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
+
+* Mon Sep 22 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Switch to lzma compressed tarball.
+
+* Sun Sep  7 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
+
+* Sun Aug  3 2008 Ville Skyttä <ville.skytta@iki.fi> - 6.7-1
+- 6.7.
+- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
+
+* Sat Apr 26 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Make rpmls work with URLs.
+
+* Sun Apr 20 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Include rpm arch in dir names created by rpmdev-extract (#443266).
+
+* Fri Apr 18 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Remove duplicate "reload" from case block in init script template.
+- Fix exit status of "reload" in case service is not running in init
+  script template (#442993).
+
+* Thu Mar 27 2008 Ville Skyttä <ville.skytta@iki.fi> - 6.6-1
+- Fix man page generation.
+
+* Wed Mar 26 2008 Ville Skyttä <ville.skytta@iki.fi> - 6.5-1
+- 6.5.
+
+* Sun Mar 23 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Generate man pages at build time.
+
+* Sat Mar 22 2008 Ville Skyttä <ville.skytta@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@iki.fi>
+- Include ocaml spec template.
+
+* Tue Mar 11 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Include Michael Schwendt's bumpspecfile.py (as rpmdev-bumpspec).
+
+* Tue Feb 12 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Sync with qa-robot upstream.
+- Update spectool to 1.0.10.
+
+* Sun Feb  3 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Add support for 7-zip, lzma and lzo in rpmdev-extract.
+
+* Fri Feb  1 2008 Ville Skyttä <ville.skytta@iki.fi>
+- Add ';;' to the init script template's reload action.
+
+* Sat Dec  8 2007 Ville Skyttä <ville.skytta@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@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@iki.fi>
+- Init script template cleanups.
+
+* Tue Aug 28 2007 Ville Skyttä <ville.skytta@iki.fi>
+- Update rpminfo to version 2004-07-07-02.
+
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta@iki.fi> - 6.1-1
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+* Mon Aug  6 2007 Ville Skyttä <ville.skytta@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@iki.fi>
+- 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@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.
+- 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ä <ville.skytta@iki.fi>
+- Add 2-argument form for comparing EVR strings to rpmdev-vercmp
+  (available only if rpmUtils.miscutils is available).
+
+* Sat Jun 16 2007 Ville Skyttä <ville.skytta@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@iki.fi>
+- Update spectool to 1.0.9 (#243731).
+
+* Wed Apr 11 2007 Ville Skyttä <ville.skytta@iki.fi>
+- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
+
+* Tue Mar 13 2007 Ville Skyttä <ville.skytta@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@iki.fi>
+- Arch-qualify output of matched packages in rmdevelrpms and allow
+  arch-qualified packages in the config file.
+
+* Wed Oct 25 2006 Ville Skyttä <ville.skytta@iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
+* Mon Oct  2 2006 Ville Skyttä <ville.skytta@iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
+* Sat Sep  9 2006 Ville Skyttä <ville.skytta@iki.fi> - 5.1-1
+- Re-add PHP PEAR spec template, more improvements to it (#198706,
+  Christopher Stone, Remi Collet).
+
+* Tue Aug 22 2006 Ville Skyttä <ville.skytta@iki.fi> - 5.0-2
+- Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.
+
+* Sun Aug 20 2006 Ville Skyttä <ville.skytta@iki.fi> - 5.0-1
 - Re-rename almost everything to rpmdev-*, with backwards compat symlinks.
 - Don't encourage %%ghost'ing *.pyo in Python spec template, add some comments.
 - Drop PHP PEAR spec template, it's not ready yet.
 
-* Wed Aug  2 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Aug  2 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Treat *-sdk as devel packages in rmdevelrpms (#199909).
 - Don't assume compface is a devel package in rmdevelrpms.
 
-* Thu Jul 20 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Thu Jul 20 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Mark things that are not needed for noarch module packages in the Perl
   spec template.
 
-* Wed Jul 19 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Jul 19 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Move option arguments to "find" before non-option ones in Perl spec template.
 - Drop python-abi dependency from Python spec template (#189947).
 
-* Tue Jul 18 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Tue Jul 18 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Add PHP PEAR spec template (#198706, Christopher Stone).
 
-* Mon Jul 17 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Mon Jul 17 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Drop fedora- prefix everywhere, add backcompat symlinks for execubtables.
 - Move %%{_sysconfdir}/fedora to %%{_sysconfdir}/rpmdevtools and
   %%{_datadir}/fedora to %%{_datadir}/rpmdevtools.
 - Move spec templates to %%{_sysconfdir}/rpmdevtools, mark as config.
 - Bump version to 5.0.
 
-* Sun Jul 16 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Sun Jul 16 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Drop fedora-kmodhelper.
 - Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use
   the system rpmdb.
 
-* Sat Jul 15 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Sat Jul 15 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Sort rmdevelrpms' output.
 
-* Fri Jul  7 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Fri Jul  7 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Improve ruby spec template (#180066, David Lutterkort).
 
-* Mon Jun  5 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Mon Jun  5 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Add manual pages for rmdevelrpms, diffarchive and extract.
 - Trim pre-2005 changelog entries.
 - Autotoolize source tree.
 
-* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.6-1
+* Tue May 16 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.6-1
 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
 
-* Sun Feb 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.5-1
+* Sun Feb 26 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.5-1
 - Improve diffarchive and extract error messages.
 
-* Fri Feb 24 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Fri Feb 24 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Update spectool to 1.0.7 (#162253).
 
-* Thu Feb  9 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Thu Feb  9 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Add file(1) based archive type detection to fedora-extract.
 
-* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Feb  8 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Add "diff file lists only" option to diffarchive.
 
-* Sun Feb  5 2006 Ville Skyttä <ville.skytta at iki.fi>
+* Sun Feb  5 2006 Ville Skyttä <ville.skytta@iki.fi>
 - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec
   use it for ruby-*.
 
-* Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-2
+* Sat Feb  4 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.4-2
 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz).
 
-* Fri Dec 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.4-1
+* Fri Dec 30 2005 Ville Skyttä <ville.skytta@iki.fi> - 1.4-1
 - Update spectool to 1.0.6 (#176521).
 
-* Wed Dec 28 2005 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Dec 28 2005 Ville Skyttä <ville.skytta@iki.fi>
 - Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.
 
-* Thu Oct 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3-1
+* Thu Oct 27 2005 Ville Skyttä <ville.skytta@iki.fi> - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).
 - Add regression test for check-rpaths* (#169298, Enrico Scholz).
 - Honor user's indent-tabs-mode setting in fedora-init.el (#170902).
 
-* Fri Oct  7 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
+* Fri Oct  7 2005 Ville Skyttä <ville.skytta@iki.fi> - 1.2-1
 - check-buildroot: grep for buildroot as a fixed string, not a regexp.
 - Update FSF's address in copyright notices.
 - check-rpaths-worker: allow multiple $ORIGIN paths in an RPATH and allow
@@ -200,12 +421,12 @@ rm -rf $RPM_BUILD_ROOT
 - Teach fedora-newrpmspec to detect and use different specfile variants.
 - Use fedora-newrpmspec in fedora-init.el.
 
-* Fri Jul  8 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1-1
+* Fri Jul  8 2005 Ville Skyttä <ville.skytta@iki.fi> - 1.1-1
 - Drop more pre-FC2 compat stuff from Perl spec template.
 - Treat gcc-gfortran as a devel package in rmdevelrpms.
 - Drop fedora.us GPG key.
 
-* Thu Mar 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
+* Thu Mar 24 2005 Ville Skyttä <ville.skytta@iki.fi> - 1.0-1
 - Make fedora-diffarchive work better with archives containing dirs without
   read/execute permissions.
 - Sync "Epoch: 0" drops with Fedora Extras CVS.
@@ -220,11 +441,11 @@ rm -rf $RPM_BUILD_ROOT
 - Don't try to remove gcc-java and related packages by default in rmdevelrpms.
 - Remove "full featured" spec template, convert newrpmspec to use -minimal.
 
-* Sun Feb  6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.1-1
+* Sun Feb  6 2005 Ville Skyttä <ville.skytta@iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).
 
-* Tue Jan 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.0-1
+* Tue Jan 18 2005 Ville Skyttä <ville.skytta@iki.fi> - 0:0.3.0-1
 - Remove 0.fdr. prefixes and epoch 0's from all spec templates.
 - Add try-restart action to init script template.
 - Remove deprecated fedora-diffrpm and fedora-unrpm.

sources

@@ -1,2 +1,2 @@
-d50bf6967feb6a36de156fcd2888a962  rpmdevtools-5.0.tar.bz2
+d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
+ec396743a9d350ac4a6d5a104807ccca  rpmdevtools-7.5.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'; },