From 4407342e1987567d9c6602fceda3d9c8e93997be Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Jan 19 2010 08:16:05 +0000
Subject: Update to 1.5.11.


---

diff --git a/.cvsignore b/.cvsignore
index 094f93a..4b9be3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-waf-1.5.10.stripped.tar.bz2
+waf-1.5.11.stripped.tar.bz2
diff --git a/import.log b/import.log
index 4a6b0c1..0bef9ba 100644
--- a/import.log
+++ b/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
diff --git a/sources b/sources
index bd9d0c3..c7f3015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68b6bfcfd93739e3e242254cfde3e051  waf-1.5.10.stripped.tar.bz2
+66e1e46e6f8535a1633a1c4f7ff2fa5e  waf-1.5.11.stripped.tar.bz2
diff --git a/waf-1.5.11-libdir.patch b/waf-1.5.11-libdir.patch
new file mode 100644
index 0000000..ebbc1f2
--- /dev/null
+++ b/waf-1.5.11-libdir.patch
@@ -0,0 +1,26 @@
+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")
+ 
+-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
++	dir = "/share/waf/"
+ 	for i in [INSTALL,'/usr','/usr/local','/opt']:
+ 		w = test(i+dir)
+ 		if w: return w
+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('py')
+ 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
diff --git a/waf-1.5.9-libdir.patch b/waf-1.5.9-libdir.patch
deleted file mode 100644
index 794be00..0000000
--- a/waf-1.5.9-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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():
- 		if w: return w
- 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
- 
--	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
-+	dir = "/share/waf/"
- 	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):
- 		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.find_sources_in_dirs('wafadmin', exts=['.py'])
diff --git a/waf.spec b/waf.spec
index 57424b7..5b7e04f 100644
--- a/waf.spec
+++ b/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.