dist-git conversion

#2781)

.cvsignore

@@ -1,2 +0,0 @@
-spectool-1.0.7.tar.bz2
-rpmdevtools-5.2.tar.bz2

.gitignore

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: rpmdevtools
-# $Id$
-NAME := rpmdevtools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

rpmdevtools.spec

@@ -1,28 +1,55 @@
 %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.7
+%define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        5.2
+Version:        6.4
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
-URL:            http://fedora.redhat.com/
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License:        GPLv2+ and GPLv2
+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
 Provides:       spectool = %{spectool_version}
-Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl, wget, file
 # Minimal RPM build requirements
-Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
-Requires:       diffutils, gzip, bzip2, unzip
+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:       rpm-python
+#Requires:      sed
+Requires:       wget
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -38,6 +65,7 @@ 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
+...and many more.
 
 
 %prep
@@ -63,36 +91,11 @@ 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
 
 
-%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} || :
@@ -113,13 +116,72 @@ fi
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_datadir}/rpmdevtools/
-%{_bindir}/*
-%{_prefix}/lib/rpm/check-*
+%{_bindir}/rpm*
+%{_bindir}/spectool
 %ghost %{_datadir}/*emacs
-%{_mandir}/man?/*.*
+%{_mandir}/man[18]/rpm*.[18]*
 
 
 %changelog
+* 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.
+
+* 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>
+- 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.
+- 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 at 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 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>
+- Update spectool to 1.0.9 (#243731).
+
+* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
+
+* 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>
+- 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 at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
 * Mon Oct  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.2-1
 - Skip *.jar.so.debug in check-buildroot (#208903).
 - Treat yasm and *-static as devel packages in rmdevelrpms.

sources

@@ -1,2 +1,2 @@
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
-41f59ef5512abd5f9bf266067166eea8  rpmdevtools-5.2.tar.bz2
+b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
+52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2