- Update to 7.7, fixes #558263.

Mon Dec 7 2009 Ville Skyttä <ville.skytta@iki.fi> - 7.6-1
- Update to 7.6, fixes #528907.

.cvsignore

@@ -0,0 +1,2 @@
+spectool-1.0.10.tar.bz2
+rpmdevtools-7.7.tar.xz

.gitignore

@@ -1,2 +0,0 @@
-/spectool-1.0.10.tar.bz2
-/rpmdevtools-7.10.tar.xz

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 $$d/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 @@
+F-12

rpmdevtools.spec

@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.10
+Version:        7.7
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -14,7 +14,6 @@ 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
-Patch1:         spectool-1.0.10-problemtags-637000.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,7 +29,7 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       %{_bindir}/man
+Requires:       man
 Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.3
 Requires:       rpm-python
@@ -62,7 +61,6 @@ rpmdev-bumpspec     Bump revision in specfile
 cp -p spectool-%{spectool_version}/README README.spectool
 cd spectool-%{spectool_version}
 %patch0 -p1
-%patch1 -p1
 cd ..
 
 
@@ -116,20 +114,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Sep 27 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.10-1
-- Update to 7.10, fixes #595135 and #619867.
-- Patch spectool to work with specfiles containing Icon or BuildArchitectures
-  (#637000).
-
-* Thu May 20 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.9-1
-- Update to 7.9, fixes #588313 and #589705.
-
-* Fri Apr 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-2
-- Require %%{_bindir}/man instead of man (#582932).
-
-* Tue Feb 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-1
-- Update to 7.8, fixes #562316.
-
 * Tue Feb  2 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.7-1
 - Update to 7.7, fixes #558263.
 

sources

@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-b2e7d7e8fbdbcae8c31b7249fd1dc615  rpmdevtools-7.10.tar.xz
+b6c935120963107693a252336f1b4db6  rpmdevtools-7.7.tar.xz

spectool-1.0.10-problemtags-637000.patch

@@ -1,14 +0,0 @@
-https://bugzilla.redhat.com/637000
-
-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	2010-09-27 19:17:31.483281717 +0300
-@@ -108,7 +108,7 @@ sub eval_sources_patches {
- 				last;
- 			}
- 		}
--		next if ($line =~ m/^\s*(BuildArch|Exclu(d|siv)e(Arch|OS))\s*:/i);
-+		next if ($line =~ m/^\s*(BuildArch(itectures)?|Exclu(d|siv)e(Arch|OS)|Icon)\s*:/i);
- 		$preamble .= $line;
- 		if ($line !~ m/^\s*(?:source|patch)\d*\s*:/) {
- 			print $tmpspec_fh $line;