[rpmdevtools] - Update to 7.10, fixes #595135 and #619867. - Patch spectool to work with specfiles containing Icon

[Ville Skyttä]

commit 65694a9c83de2ae8f28d6f2dc0bcf99bcfbeed6d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Sep 27 21:26:31 2010 +0300

    - Update to 7.10, fixes #595135 and #619867.
    - Patch spectool to work with specfiles containing Icon and BuildArchitectures
      (#637000).

 .gitignore                               |    4 ++--
 rpmdevtools.spec                         |    9 ++++++++-
 sources                                  |    2 +-
 spectool-1.0.10-problemtags-637000.patch |   14 ++++++++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 379f7b2..e7d16f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-spectool-1.0.10.tar.bz2
-rpmdevtools-7.9.tar.xz
+/spectool-1.0.10.tar.bz2
+/rpmdevtools-7.10.tar.xz
diff --git a/rpmdevtools.spec b/rpmdevtools.spec
index b0ddcbb..df38910 100644
--- a/rpmdevtools.spec
+++ b/rpmdevtools.spec
@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.9
+Version:        7.10
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -14,6 +14,7 @@ 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
@@ -61,6 +62,7 @@ rpmdev-bumpspec     Bump revision in specfile
 cp -p spectool-%{spectool_version}/README README.spectool
 cd spectool-%{spectool_version}
 %patch0 -p1
+%patch1 -p1
 cd ..
 
 
@@ -114,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 27 2010 Ville Skyttä <ville.skytta at 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 at iki.fi> - 7.9-1
 - Update to 7.9, fixes #588313 and #589705.
 
diff --git a/sources b/sources
index 9131e6b..2dee1ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-48b0c77432b2f2dfa8d8e67c2f565e7d  rpmdevtools-7.9.tar.xz
+b2e7d7e8fbdbcae8c31b7249fd1dc615  rpmdevtools-7.10.tar.xz
diff --git a/spectool-1.0.10-problemtags-637000.patch b/spectool-1.0.10-problemtags-637000.patch
new file mode 100644
index 0000000..047b526
--- /dev/null
+++ b/spectool-1.0.10-problemtags-637000.patch
@@ -0,0 +1,14 @@
+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;