Update to 1.5.11.

.cvsignore

@@ -1 +1 @@
-waf-1.5.10.stripped.tar.bz2
+waf-1.5.11.stripped.tar.bz2

import.log

@@ -9,3 +9,4 @@ waf-1_5_6-1_fc11:HEAD:waf-1.5.6-1.fc11.src.rpm:1241507304
 waf-1_5_8-1_fc11:HEAD:waf-1.5.8-1.fc11.src.rpm:1244757177
 waf-1_5_9-1_fc11:HEAD:waf-1.5.9-1.fc11.src.rpm:1251738819
 waf-1_5_10-1_fc12:HEAD:waf-1.5.10-1.fc12.src.rpm:1258443992
+waf-1_5_11-1_fc12:HEAD:waf-1.5.11-1.fc12.src.rpm:1263888781

sources

@@ -1 +1 @@
-68b6bfcfd93739e3e242254cfde3e051  waf-1.5.10.stripped.tar.bz2
+66e1e46e6f8535a1633a1c4f7ff2fa5e  waf-1.5.11.stripped.tar.bz2

waf-1.5.11-libdir.patch

@@ -1,7 +1,8 @@
-diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light
---- waf-1.5.9/waf-light.orig	2009-08-29 15:32:07.000000000 +0200
-+++ waf-1.5.9/waf-light	2009-08-31 19:08:19.000000000 +0200
-@@ -123,7 +123,7 @@ def find_lib():
+diff --git a/waf-light b/waf-light
+index 2b8f9a9..0bde2fa 100755
+--- a/waf-light
++++ b/waf-light
+@@ -127,7 +127,7 @@ def find_lib():
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
  
@@ -10,15 +11,16 @@ diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
-diff -up waf-1.5.9/wscript.orig waf-1.5.9/wscript
---- waf-1.5.9/wscript.orig	2009-08-29 15:32:07.000000000 +0200
-+++ waf-1.5.9/wscript	2009-08-31 19:08:19.000000000 +0200
-@@ -317,7 +317,7 @@ def build(bld):
+diff --git a/wscript b/wscript
+index 42c39e9..2b3b42d 100644
+--- a/wscript
++++ b/wscript
+@@ -313,7 +313,7 @@ def build(bld):
  		if val != True and val != "y": sys.exit(1)
  		create_waf()
  
 -	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
 +	dir = os.path.join('share', 'waf', 'wafadmin')
  
- 	wafadmin = bld.new_task_gen('py')
+ 	wafadmin = bld('py')
  	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])

waf.spec

@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.10
+Version:        1.5.11
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -12,7 +12,7 @@ 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.9-libdir.patch
+Patch0:         waf-1.5.11-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -23,8 +23,8 @@ Requires:       python-abi %(%{__python} -c "import sys ; print \"=\", sys.versi
 
 # the demo suite contains a perl module, which draws in unwanted
 # provides and requires
-%define __perl_provides %{nil}
-%define __perl_requires %{nil}
+%global __perl_provides %{nil}
+%global __perl_requires %{nil}
 
 
 %description
@@ -83,6 +83,10 @@ find demos utils -type f -exec %{__chmod} 0644 {} \;
 
 
 %changelog
+* Mon Jan 18 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.11-1
+- Update to 1.5.11.
+- Use %%global instead of %%define.
+
 * Mon Nov 16 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.10-1
 - Update to 1.5.10.