Update to upstream version 1.4.2.

.cvsignore

@@ -1 +1 @@
-waf-1.4.1.tar.bz2
+waf-1.4.2.tar.bz2

sources

@@ -1 +1 @@
-2e9055fe3b5e0ab1917f5e1ff1fa8c81  waf-1.4.1.tar.bz2
+0d0c397ee675b2df79f65b375eb8a0f8  waf-1.4.2.tar.bz2

waf-1.4.2-libdir.patch

@@ -1,6 +1,7 @@
---- waf-light.libdir	2008-05-04 16:54:14.000000000 +0200
-+++ waf-light	2008-05-04 18:25:13.000000000 +0200
-@@ -109,7 +109,7 @@
+diff -up waf-1.4.2/waf-light.libdir waf-1.4.2/waf-light
+--- waf-1.4.2/waf-light.libdir	2008-05-17 14:24:37.000000000 +0200
++++ waf-1.4.2/waf-light	2008-05-26 08:56:47.000000000 +0200
+@@ -109,7 +109,7 @@ def find_lib():
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
  
@@ -9,9 +10,10 @@
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
---- wscript.libdir	2008-05-04 16:54:14.000000000 +0200
-+++ wscript	2008-05-04 18:25:13.000000000 +0200
-@@ -295,7 +295,7 @@
+diff -up waf-1.4.2/wscript.libdir waf-1.4.2/wscript
+--- waf-1.4.2/wscript.libdir	2008-05-17 14:24:37.000000000 +0200
++++ waf-1.4.2/wscript	2008-05-26 08:56:47.000000000 +0200
+@@ -301,7 +301,7 @@ def install_waf():
  		prefix = Params.g_options.prefix
  
  	binpath     = os.path.join(prefix, 'bin%swaf' % os.sep)

waf.spec

@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        A Python-based build system
 
@@ -9,7 +9,7 @@ License:        BSD and Python
 URL:            http://code.google.com/p/waf/
 Source0:        http://waf.googlecode.com/files/waf-%{version}.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.4.1-libdir.patch
+Patch0:         waf-1.4.2-libdir.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -32,7 +32,7 @@ Autotools, Scons, CMake or Ant.
 
 %prep
 %setup -q
-%patch0 -p0 -b .libdir
+%patch0 -p1 -b .libdir
 
 
 %build
@@ -42,10 +42,12 @@ Autotools, Scons, CMake or Ant.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# remove shebangs from all scripts in wafadmin
-find wafadmin -name '*.py' -exec sed -i "1{/^#!/d}" {} \;
+# the install target wants an acknowledgement
+echo y | ./waf install --prefix=%{_prefix} --destdir=$RPM_BUILD_ROOT
 
-./waf install --prefix=%{_prefix} --destdir=$RPM_BUILD_ROOT
+# remove shebangs from all scripts in wafadmin
+find $RPM_BUILD_ROOT%{_datadir}/waf/wafadmin -name '*.py' \
+     -exec sed -i '1{/^#!/d}' {} \;
 
 # fix waf script shebang line
 sed -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
@@ -53,12 +55,13 @@ sed -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
 # fix EOL
 sed -i 's|\r$||g' utils/amtool.py
 
-# remove zero-length file
-rm demos/gnome/src/hello.h
-
 # remove x-bits from everything going to doc
 find demos utils -type f -exec chmod 0644 {} \;
 
+# remove zero-length files
+rm demos/gnome/src/hello.h
+rm demos/simple_scenarios/local_tool/uh.coin
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +75,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 17 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.4.2-1
+- Update to 1.4.2.
+- Remove shebang lines from files in wafadmin after installation, not
+  before, otherwise install will re-add them.
+
 * Sun May  4 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.4.1-1
 - Update to upstream version 1.4.1.