From c9a5e9c26fb71352169e651d85f1f643d4b3c42d Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sat, 22 Jan 2011 03:09:53 +0100
Subject: [PATCH] - Update libdir patch for py3k. - Add patch to fix syntax
 error in extras/boost.py. - Remove hidden file.

---
 waf-1.6.2-extras-boost-syntax.patch | 22 ++++++++++++++++++++++
 waf-1.6.2-libdir.patch              |  2 +-
 waf.spec                            | 14 ++++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 waf-1.6.2-extras-boost-syntax.patch

diff --git a/waf-1.6.2-extras-boost-syntax.patch b/waf-1.6.2-extras-boost-syntax.patch
new file mode 100644
index 0000000..6fb6ae0
--- /dev/null
+++ b/waf-1.6.2-extras-boost-syntax.patch
@@ -0,0 +1,22 @@
+Index: waflib/extras/boost.py
+===================================================================
+--- waflib/extras/boost.py	(revision 10894)
++++ waflib/extras/boost.py	(revision 10895)
+@@ -319,7 +319,7 @@
+ 			self.start_msg(kw.get('msg_includes', 'Checking for boost include path'))
+ 			ret = self.find_boost_includes(kw)
+ 
+-	except Errors.ConfigurationError, e:
++	except Errors.ConfigurationError as e:
+ 		if 'errmsg' in kw:
+ 			self.end_msg(kw['errmsg'], 'YELLOW')
+ 		raise e
+@@ -331,7 +331,7 @@
+ 		self.start_msg('Checking for library boost_'+lib)
+ 		try:
+ 			self.find_boost_library(lib, kw)
+-		except Errors.ConfigurationError, e:
++		except Errors.ConfigurationError as e:
+ 			ret = False
+ 			if 'errmsg' in kw:
+ 				self.end_msg(kw['errmsg'], 'YELLOW')
diff --git a/waf-1.6.2-libdir.patch b/waf-1.6.2-libdir.patch
index 46beb52..2a50438 100644
--- a/waf-1.6.2-libdir.patch
+++ b/waf-1.6.2-libdir.patch
@@ -4,7 +4,7 @@
  		w = test(i + '/lib/' + dirname)
  		if w: return w
  
-+	w = test('/usr/share/waf')
++	w = test('/usr/share/%s' % WAF)
 +	if w: return w
 +
  	#waf-local
diff --git a/waf.spec b/waf.spec
index a2166be..3a9477d 100644
--- a/waf.spec
+++ b/waf.spec
@@ -11,7 +11,7 @@
 
 Name:           waf
 Version:        1.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -24,6 +24,8 @@ 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
+# upstream r10895
+Patch1:         waf-1.6.2-extras-boost-syntax.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -55,6 +57,7 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p0 -b .libdir
+%patch1 -p0 -b .py3k
 
 
 %build
@@ -106,6 +109,9 @@ sed -i "1c#! /usr/bin/python" %{buildroot}%{_bindir}/waf
 # remove x-bits from everything going to doc
 find demos utils -type f -exec %{__chmod} 0644 {} \;
 
+# remove hidden file
+rm -f docs/sphinx/build/html/.buildinfo
+
 # do byte compilation
 %py_byte_compile %{__python} %{buildroot}%{_datadir}/waf
 %if 0%{?with_python3}
@@ -130,8 +136,12 @@ rm -rf %{buildroot}
 %endif # with_python3
 
 
-
 %changelog
+* Sat Jan 22 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.2-4
+- Update libdir patch for py3k.
+- Add patch to fix syntax error in extras/boost.py.
+- Remove hidden file.
+
 * Fri Jan 21 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.2-3
 - Make waf compatible with python3, if available.