Revert "Revert wrong merge from EL-6, use rpmdevtools-5.3-2.el5 as base"

This reverts commit ac9154dbe1.

.gitignore

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

rpmdevtools.spec

@@ -1,24 +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.9
+%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.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}
+Version:        6.8
+Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
-URL:            http://fedoraproject.org/
-Source0:        %{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/rpmdevtools/
+Source0:        https://fedorahosted.org/releases/r/p/rpmdevtools/%{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
@@ -36,7 +38,6 @@ Requires:       grep
 Requires:       gzip
 Requires:       info
 Requires:       make
-Requires:       patch
 Requires:       redhat-release
 Requires:       redhat-rpm-config
 Requires:       rpm-build >= 4.4.2.1
@@ -51,7 +52,7 @@ Requires:       fakeroot
 Requires:       file
 Requires:       perl
 Requires:       python
-Requires:       rpm-python
+Requires:       rpm-python >= 4.4.2.2
 #Requires:      sed
 Requires:       wget
 
@@ -64,11 +65,12 @@ 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 RPM package 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.
 
 
@@ -149,27 +151,122 @@ fi
 
 
 %changelog
-* 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).
+* Fri Apr  3 2009 Ville Skyttä <ville.skytta at iki.fi> - 6.8-1
+- 6.8.
+
+* 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).
+- 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).
+
+* 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).
+
+* 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.
+
+* Sat Apr 26 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Make rpmls work with URLs.
+
+* Sun Apr 20 2008 Ville Skyttä <ville.skytta at iki.fi>
+- Include rpm arch in dir names created by rpmdev-extract (#443266).
+
+* Fri Apr 18 2008 Ville Skyttä <ville.skytta at 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 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 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
 - 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.
 
-* 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.
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta at 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 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> - 5.4-1
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at 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 at iki.fi>
+* 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.
 - Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
 - Add LSB comment block to init script template.
 
@@ -178,6 +275,8 @@ fi
   (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>

sources

@@ -1,2 +1,2 @@
-b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
-52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2
+d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
+32a879de3650642a75e58f61f3b07d8e  rpmdevtools-6.8.tar.bz2