Update for compatibility with rpm-build >= 4.4.2.1 (ouch, a surprise FC-6

update)

.cvsignore

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

.gitignore

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

Makefile

@@ -0,0 +1,21 @@
+# 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)

branch

@@ -0,0 +1 @@
+FC-6

rpmdevtools.spec

@@ -3,7 +3,7 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.4
+Version:        6.1
 # 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.
@@ -22,38 +22,26 @@ BuildArch:      noarch
 Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
-# Minimal RPM build requirements
-Requires:       bash
-Requires:       bzip2
-Requires:       coreutils
+# Required for tool operations
+Requires:       rpm-python
+Requires:       python
 Requires:       cpio
-Requires:       diffutils
-Requires:       findutils
-Requires:       gawk
+Requires:       sed
+Requires:       perl
+Requires:       wget
+Requires:       file
+Requires:       fakeroot
+# Minimal RPM build requirements
+Requires:       rpm-build >= 4.4.2.1
 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:       make
 Requires:       tar
+Requires:       diffutils
+Requires:       gzip
+Requires:       bzip2
 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
@@ -149,13 +137,6 @@ 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).
-- Sync deps with Fedora's new "assumed present in buildroots" packages list.
-- Init script template cleanups.
-- 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,

sources

@@ -1,2 +1,2 @@
 b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
-52c257170fb8de032196f04859bdee2c  rpmdevtools-6.4.tar.bz2
+3d5e2747d1955bb902127b4d9ded30a0  rpmdevtools-6.1.tar.bz2