- Update to 1.5.17.

- Add patch from issue 682 to install 3rd party tools.

.cvsignore

@@ -1 +1 @@
-waf-1.5.15.stripped.tar.bz2
+waf-1.5.17.stripped.tar.bz2

import.log

@@ -14,3 +14,4 @@ waf-1_5_12-1_fc12:HEAD:waf-1.5.12-1.fc12.src.rpm:1266169833
 waf-1_5_13-1_fc12:HEAD:waf-1.5.13-1.fc12.src.rpm:1267653823
 waf-1_5_14-1_fc12:HEAD:waf-1.5.14-1.fc12.src.rpm:1267987981
 waf-1_5_15-1_fc12:HEAD:waf-1.5.15-1.fc12.src.rpm:1270483273
+waf-1_5_17-1_fc12:HEAD:waf-1.5.17-1.fc12.src.rpm:1274737841

sources

@@ -1 +1 @@
-0367a0d3b499ec27b5c3d296bda8bb0b  waf-1.5.15.stripped.tar.bz2
+a83409465a1d5b0f1cf1b6504db1f015  waf-1.5.17.stripped.tar.bz2

waf-1.5.17-install_3rdparty.patch

@@ -0,0 +1,15 @@
+diff --git a/wscript b/wscript
+index 438dc4c..cc6557b 100644
+--- a/wscript
++++ b/wscript
+@@ -350,6 +350,10 @@ def build(bld):
+ 	tools.find_sources_in_dirs('wafadmin/Tools', exts=['.py'])
+ 	tools.install_path = os.path.join('${PREFIX}', dir, 'Tools')
+ 
++	thirdparty = bld(features = 'py')
++	thirdparty.find_sources_in_dirs('wafadmin/3rdparty', exts=['.py'])
++	thirdparty.install_path = os.path.join('${PREFIX}', dir, '3rdparty')
++
+ 	bld.install_files('${PREFIX}/bin', 'waf', chmod=0755)
+ 
+ 	#print "waf is now installed in %s [%s, %s]" % (prefix, wafadmindir, binpath)

waf-1.5.17-libdir.patch

@@ -1,8 +1,8 @@
 diff --git a/waf-light b/waf-light
-index 2068d44..c4ed3e6 100755
+index 16131d7..f613966 100755
 --- a/waf-light
 +++ b/waf-light
-@@ -127,7 +127,7 @@ def find_lib():
+@@ -131,7 +131,7 @@ def find_lib():
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
  
@@ -12,10 +12,10 @@ index 2068d44..c4ed3e6 100755
  		w = test(i+dir)
  		if w: return w
 diff --git a/wscript b/wscript
-index 8313ad3..02a7b6a 100644
+index 3b02a42..438dc4c 100644
 --- a/wscript
 +++ b/wscript
-@@ -313,7 +313,7 @@ def build(bld):
+@@ -340,7 +340,7 @@ def build(bld):
  		if val != True and val != "y": sys.exit(1)
  		create_waf()
  

waf.spec

@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.15
+Version:        1.5.17
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -12,7 +12,9 @@ URL:            http://code.google.com/p/waf/
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.15-libdir.patch
+Patch0:         waf-1.5.17-libdir.patch
+# patch from ticket 682
+Patch1:         waf-1.5.17-install_3rdparty.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -36,6 +38,7 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .install_3rdparty
 
 
 %build
@@ -67,7 +70,7 @@ find demos utils -type f -exec %{__chmod} 0644 {} \;
 
 # bash completion
 %{__install} -D -p -m 0644 utils/waf-completion.bash \
-  %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
+  %{buildroot}%{_sysconfdir}/bash_completion.d/waf-completion.bash
 
 
 %clean
@@ -83,6 +86,10 @@ find demos utils -type f -exec %{__chmod} 0644 {} \;
 
 
 %changelog
+* Mon May 24 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.17-1
+- Update to 1.5.17.
+- Add patch from issue 682 to install 3rd party tools.
+
 * Mon Apr  5 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.15-1
 - Update to 1.5.15.