From 8f197f49cec67c4f1bc8643d160ccc43e506a628 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Krzysztof=20Goli=C5=84ski?= <dirdival@pld-linux.org>
Date: Thu, 8 Jul 2010 22:41:30 +0000
Subject: [PATCH] - updated to 1.5.18

Changed files:
    waf-path.patch -> 1.8
    waf.spec -> 1.26
---
 waf-path.patch | 20 ++++++++++----------
 waf.spec       |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/waf-path.patch b/waf-path.patch
index d7d903e..b3d8036 100644
--- a/waf-path.patch
+++ b/waf-path.patch
@@ -1,13 +1,13 @@
-diff -burNp waf-1.5.13/waf-light waf-1.5.13-dud/waf-light
---- waf-1.5.13/waf-light	2010-02-16 22:42:45.000000000 +0100
-+++ waf-1.5.13-dud/waf-light	2010-03-02 23:37:42.640873759 +0100
+diff -Nurpb waf-1.5.18org/waf-light waf-1.5.18/waf-light
+--- waf-1.5.18org/waf-light	2010-07-06 19:50:52.000000000 +0200
++++ waf-1.5.18/waf-light	2010-07-09 00:28:54.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
- # encoding: ISO8859-1
+ # encoding: ISO-8859-1
  # Thomas Nagy, 2005-2010
  
-@@ -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")
  
@@ -16,15 +16,15 @@ diff -burNp waf-1.5.13/waf-light waf-1.5.13-dud/waf-light
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
-diff -burNp waf-1.5.13/wscript waf-1.5.13-dud/wscript
---- waf-1.5.13/wscript	2010-02-16 22:42:46.000000000 +0100
-+++ waf-1.5.13-dud/wscript	2010-03-02 23:38:37.807336784 +0100
-@@ -313,7 +313,7 @@ def build(bld):
+diff -Nurpb waf-1.5.18org/wscript waf-1.5.18/wscript
+--- waf-1.5.18org/wscript	2010-07-06 19:50:52.000000000 +0200
++++ waf-1.5.18/wscript	2010-07-09 00:31:03.000000000 +0200
+@@ -340,7 +340,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('lib', 'waf', 'wafadmin')
  
- 	wafadmin = bld('py')
+ 	wafadmin = bld(features = 'py')
  	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
diff --git a/waf.spec b/waf.spec
index 33f028a..a522e61 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,12 +1,12 @@
 Summary:	The Waf build system
 Summary(pl.UTF-8):	System budowania Waf
 Name:		waf
-Version:	1.5.16
+Version:	1.5.18
 Release:	1
 License:	BSD
 Group:		Development/Building
 Source0:	http://waf.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	2848186b015cedcf35047cd95ccd946b
+# Source0-md5:	cb1153491525ed6ea652391015c690eb
 Patch0:		%{name}-path.patch
 URL:		http://code.google.com/p/waf/
 BuildRequires:	python >= 2.4
-- 
2.44.0