Update to 1.5.15.

.cvsignore

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

import.log

@@ -13,3 +13,4 @@ waf-1_5_11-1_fc12:HEAD:waf-1.5.11-1.fc12.src.rpm:1263888781
 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

sources

@@ -1 +1 @@
-d57c6c3778dba5c53c364dcedbcfb67c  waf-1.5.14.stripped.tar.bz2
+0367a0d3b499ec27b5c3d296bda8bb0b  waf-1.5.15.stripped.tar.bz2

waf-1.5.15-libdir.patch

@@ -1,5 +1,5 @@
 diff --git a/waf-light b/waf-light
-index 1fb8ce4..e0e0f53 100755
+index 2068d44..c4ed3e6 100755
 --- a/waf-light
 +++ b/waf-light
 @@ -127,7 +127,7 @@ def find_lib():
@@ -12,7 +12,7 @@ index 1fb8ce4..e0e0f53 100755
  		w = test(i+dir)
  		if w: return w
 diff --git a/wscript b/wscript
-index e660196..6b2e754 100644
+index 8313ad3..02a7b6a 100644
 --- a/wscript
 +++ b/wscript
 @@ -313,7 +313,7 @@ def build(bld):
@@ -22,5 +22,5 @@ index e660196..6b2e754 100644
 -	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
 +	dir = os.path.join('share', 'waf', 'wafadmin')
  
- 	wafadmin = bld('py')
+ 	wafadmin = bld(features = 'py')
  	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])

waf.spec

@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.14
+Version:        1.5.15
 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.14-libdir.patch
+Patch0:         waf-1.5.15-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -56,7 +56,7 @@ find %{buildroot}%{_datadir}/waf/wafadmin -name '*.py' \
 %{__sed} -i "1c#! /usr/bin/python" %{buildroot}%{_bindir}/waf
 
 # fix EOL
-%{__sed} -i 's|\r$||g' utils/amtool.py
+%{__sed} -i 's|\r$||g' utils/amtool.py utils/waf.py
 
 # remove x-bits from everything going to doc
 find demos utils -type f -exec %{__chmod} 0644 {} \;
@@ -83,6 +83,9 @@ find demos utils -type f -exec %{__chmod} 0644 {} \;
 
 
 %changelog
+* Mon Apr  5 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.15-1
+- Update to 1.5.15.
+
 * Sun Mar  7 2010 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.14-1
 - Update to 1.5.14.