dist-git conversion

#2781)

.gitignore

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

rpmdevtools.spec

@@ -1,41 +1,59 @@
-%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
+%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
 
 Name:           rpmdevtools
-Version:        7.3
-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:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
+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
-# lzma for unpacking the tarball
-BuildRequires:  lzma
-# help2man, pod2man, *python for creating man pages
-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
+Requires:       bzip2
+Requires:       coreutils
+Requires:       cpio
 Requires:       diffutils
-Requires:       fakeroot
-Requires:       file
 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:       rpm-python
 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:       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
@@ -46,12 +64,11 @@ 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/sha*     Display checksums of all files in an RPM package file
+rpmdev-md5          Display the md5sum of all files in an RPM
 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.
 
 
@@ -78,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} || :
@@ -102,8 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
-%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
+%{_bindir}/fedora-*
 %{_bindir}/rpm*
 %{_bindir}/spectool
 %ghost %{_datadir}/*emacs
@@ -111,173 +149,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* 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.
-
-* 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 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.
 
@@ -286,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>
@@ -298,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
-5475dc402a40356163e4a9b468f6497b  rpmdevtools-7.3.tar.lzma
+b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
+52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2