Update to upstream version 1.4.0.

.cvsignore

@@ -1 +1 @@
-waf-1.3.2.tar.bz2
+waf-1.4.0.tar.bz2

sources

@@ -1 +1 @@
-9caca69cb435911c9ed6ff0519ce19ae  waf-1.3.2.tar.bz2
+bf99b9bad69707816de5b5a910357611  waf-1.4.0.tar.bz2

waf-1.3.2-latex.patch

@@ -1,42 +0,0 @@
-Index: wafadmin/Tools/tex.py
-===================================================================
---- wafadmin/Tools/tex.py	(Revision 2338)
-+++ wafadmin/Tools/tex.py	(Revision 2339)
-@@ -2,7 +2,7 @@
- # encoding: utf-8
- # Thomas Nagy, 2006 (ita)
- 
--"LaTeX/PDFLaTeX support"
-+"TeX/LaTeX/PDFLaTeX support"
- 
- import os, re
- import Utils, Params, Action, Object, Runner, Scan
-@@ -33,14 +33,14 @@
- 					# add another loop for the tex include paths?
- 					debug("trying %s%s" % (path, k), 'tex')
- 					try:
--						os.stat(path+k)
-+						os.stat(abs+os.sep+path+k)
- 					except OSError:
- 						continue
- 					found = path+k
- 					node = curdirnode.find_source(found)
- 					nodes.append(node)
- 				else:
--					debug('could not find'+path, 'tex')
-+					debug('could not find %s' % path, 'tex')
- 					names.append(path)
- 
- 		debug("found the following : %s and names %s" % (nodes, names), 'tex')
-@@ -59,11 +59,8 @@
- 		exec_cmd = Runner.exec_command
- 		com = '%s %s %s' % (env[command], env.get_flat(command+'FLAGS'), '-interaction=batchmode')
- 
--
- 	node = task.m_inputs[0]
- 	reldir  = node.bld_dir(env)
--
--
- 	srcfile = node.srcpath(env)
- 
- 	lst = []

waf-1.4.0-libdir.patch

@@ -1,5 +1,5 @@
---- waf-light.orig	2008-02-09 23:06:53.000000000 +0100
+--- waf-light.orig	2008-04-11 23:12:27.000000000 +0200
-+++ waf-light	2008-02-10 19:38:32.000000000 +0100
++++ waf-light	2008-04-19 12:10:49.000000000 +0200
 @@ -107,7 +107,7 @@
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
@@ -9,9 +9,9 @@
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
---- wscript.orig	2008-02-09 23:06:53.000000000 +0100
+--- wscript.orig	2008-04-11 23:12:27.000000000 +0200
-+++ wscript	2008-02-10 19:40:10.000000000 +0100
++++ wscript	2008-04-19 12:10:49.000000000 +0200
-@@ -218,7 +218,7 @@
+@@ -295,7 +295,7 @@
  		prefix = Params.g_options.prefix
  
  	binpath     = os.path.join(prefix, 'bin%swaf' % os.sep)

waf.spec

@@ -1,6 +1,6 @@
 Name:           waf
-Version:        1.3.2
+Version:        1.4.0
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        A Python-based build system
 
 Group:          Development/Tools
@@ -9,8 +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.3.2-libdir.patch
+Patch0:         waf-1.4.0-libdir.patch
-Patch1:         waf-1.3.2-latex.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -34,7 +33,6 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p0 -b .libdir
-%patch1 -p0 -b .latex
 
 
 %build
@@ -68,12 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO demos doc/waf.pdf utils
+%doc README TODO ChangeLog demos doc/waf.pdf utils
 %{_bindir}/waf
 %{_datadir}/waf
 
 
 %changelog
+* Sat Apr 19 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.4.0-1
+- Update to upstream version 1.4.0.
+
 * Wed Apr  9 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.3.2-6
 - Upstream patch to fix latex dependency scanning: trunk rev 2340.