[waf] Update to 1.6.6. Remove unused extras/subprocess.py. Small patch for syntax errors.

[Thomas Moschny]

commit bb08350207f1158a3fe35dd24baf28d70404d3f0
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Jun 19 16:08:57 2011 +0200

    Update to 1.6.6.
    Remove unused extras/subprocess.py.
    Small patch for syntax errors.

 .gitignore             |    1 +
 repack.sh              |    5 +++--
 sources                |    2 +-
 waf-1.6.6-syntax.patch |   26 ++++++++++++++++++++++++++
 waf.spec               |   17 ++++++++++++++---
 5 files changed, 45 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02a3f0f..9c30c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ waf-1.5.18.stripped.tar.bz2
 /waf-1.6.2.stripped.tar.bz2
 /waf-1.6.3.stripped.tar.bz2
 /waf-1.6.4.stripped.tar.bz2
+/waf-1.6.6.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index b9b6ec2..9d60179 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.6.4
+version=1.6.6
 
 src=waf-${version}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
@@ -11,6 +11,7 @@ cp -av ${src} ${dst}
 bzip2 -d ${dst}
 
 tar --delete --file=${dst%.bz2} \
-     waf-${version}/docs/book
+     waf-${version}/docs/book \
+     waf-${version}/waflib/extras/subprocess.py
 
 bzip2 ${dst%.bz2}
diff --git a/sources b/sources
index f37c622..959f892 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4942858f48533826909a3334daf28454  waf-1.6.4.stripped.tar.bz2
+70d0e550f91880c0f5ce72147c3688f3  waf-1.6.6.stripped.tar.bz2
diff --git a/waf-1.6.6-syntax.patch b/waf-1.6.6-syntax.patch
new file mode 100644
index 0000000..81ba5a2
--- /dev/null
+++ b/waf-1.6.6-syntax.patch
@@ -0,0 +1,26 @@
+Index: waflib/extras/review.py
+===================================================================
+--- waflib/extras/review.py	(revision 11401)
++++ waflib/extras/review.py	(revision 11402)
+@@ -47,7 +47,7 @@
+ 
+ 	def __delitem__(self, key):
+ 		if not key in self._keys:
+-			raise KeyError, key
++			raise KeyError(key)
+ 		dict.__delitem__(self, key)
+ 		self._keys.remove(key)
+ 
+Index: waflib/extras/md5_tstamp.py
+===================================================================
+--- waflib/extras/md5_tstamp.py	(revision 11401)
++++ waflib/extras/md5_tstamp.py	(revision 11402)
+@@ -33,7 +33,7 @@
+ 	self.restore_real()
+ 	try:
+ 		Build.hash_cache = self.hash_cache or {}
+-	except Exception, e:
++	except Exception as e:
+ 		Build.hash_cache = {}
+ Build.BuildContext.restore_real = Build.BuildContext.restore
+ Build.BuildContext.restore      = restore
diff --git a/waf.spec b/waf.spec
index 20c0edf..4e11da9 100644
--- a/waf.spec
+++ b/waf.spec
@@ -9,7 +9,7 @@
 %global with_docs 1
 
 Name:           waf
-Version:        1.6.4
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -18,11 +18,16 @@ License:        BSD and Python
 URL:            http://code.google.com/p/waf/
 # Original tarfile can be found at
 # http://waf.googlecode.com/files/waf-%%{version}.tar.bz2
-# We remove docs/book, as this is under CC-BY-NC-ND, which is not
-# allowed in Fedora.
+# We remove:
+# - /docs/book, as this is under CC-BY-NC-ND, which is not allowed in
+#   Fedora
+# - /waflib/extras/subprocess.py, is under a Python license and not
+#   needed in Fedora
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.6.2-libdir.patch
+# upstream r11402
+Patch1:         waf-1.6.6-syntax.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -58,6 +63,7 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p0 -b .libdir
+%patch1 -p0
 
 
 %build
@@ -140,6 +146,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jun 18 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.6-1
+- Update to 1.6.6.
+- Remove unused extras/subprocess.py.
+- Small patch for syntax errors.
+
 * Sun Apr 17 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.4-1
 - Update to 1.6.4.