From 2f896fb09bae2d67e16c856b9223f7e3b0e5a903 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sun, 18 Dec 2011 13:09:53 +0100
Subject: [PATCH] Update to 1.6.10. Remove patch applied upstream.

---
 .gitignore             |  1 +
 repack.sh              |  2 +-
 sources                |  2 +-
 waf-1.6.8-syntax.patch | 12 ------------
 waf.spec               | 12 +++++++-----
 5 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 waf-1.6.8-syntax.patch

diff --git a/.gitignore b/.gitignore
index 3104011..6a2167a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ waf-1.5.18.stripped.tar.bz2
 /waf-1.6.6.stripped.tar.bz2
 /waf-1.6.8.stripped.tar.bz2
 /waf-1.6.9.stripped.tar.bz2
+/waf-1.6.10.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 6fc086c..f32355c 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.6.9
+version=1.6.10
 
 src=waf-${version}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index 432a0ad..5e44827 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7af2af06813a366eba6fabc76cee47e5  waf-1.6.9.stripped.tar.bz2
+7402024d472d80357bad08844d038a09  waf-1.6.10.stripped.tar.bz2
diff --git a/waf-1.6.8-syntax.patch b/waf-1.6.8-syntax.patch
deleted file mode 100644
index bde20e4..0000000
--- a/waf-1.6.8-syntax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up waf-1.6.8/waflib/extras/qnxnto.py.orig waf-1.6.8/waflib/extras/qnxnto.py
---- waf-1.6.8/waflib/extras/qnxnto.py.orig	2011-10-01 19:06:38.000000000 +0200
-+++ waf-1.6.8/waflib/extras/qnxnto.py	2011-10-03 12:29:27.970114038 +0200
-@@ -34,7 +34,7 @@ class Popen(object):
- 			else:
- 				if Popen.verbose:
- 					print("Emulating")
--		except Exception, e:
-+		except Exception as e:
- 			if Popen.verbose:
- 				print("Exception: %s" % e)
- 			raise
diff --git a/waf.spec b/waf.spec
index 219e4fe..e552422 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,7 +10,7 @@
 %global with_docs 1
 
 Name:           waf
-Version:        1.6.9
+Version:        1.6.10
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -27,8 +27,7 @@ URL:            http://code.google.com/p/waf/
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.6.2-libdir.patch
-Patch1:         waf-1.6.8-syntax.patch
-Patch2:         waf-1.6.9-logo.patch
+Patch1:         waf-1.6.9-logo.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -98,8 +97,7 @@ This package contains the HTML documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p0 -b .libdir
-%patch1 -p1 -b .syntax
-%patch2 -p1 -b .logo
+%patch1 -p1 -b .logo
 
 
 %build
@@ -201,6 +199,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Dec 18 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.10-1
+- Update to 1.6.10.
+- Remove patch applied upstream.
+
 * Sat Nov 26 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.9-1
 - Update to 1.6.9.
 - Patch to not use the logo (which has been removed) in the docs.