From a3476275767844d3f95f20211f7199b01b7b01a0 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sat, 19 Apr 2008 10:36:46 +0000
Subject: [PATCH] Upstream patch to fix latex dependency scanning: trunk rev
 2340.

---
 waf-1.3.2-latex.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 waf.spec              |  7 ++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 waf-1.3.2-latex.patch

diff --git a/waf-1.3.2-latex.patch b/waf-1.3.2-latex.patch
new file mode 100644
index 0000000..0681f5f
--- /dev/null
+++ b/waf-1.3.2-latex.patch
@@ -0,0 +1,42 @@
+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 = []
diff --git a/waf.spec b/waf.spec
index 236d389..ca07dc4 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,6 +1,6 @@
 Name:           waf
 Version:        1.3.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Python-based build system
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@ 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
+Patch1:         waf-1.3.2-latex.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -33,6 +34,7 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p0 -b .libdir
+%patch1 -p0 -b .latex
 
 
 %build
@@ -72,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr  9 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.3.2-6
+- Upstream patch to fix latex dependency scanning: trunk rev 2340.
+
 * Sun Feb 10 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.3.2-5
 - Update to 1.3.2.
 - Remove version and revision information from path to waf cache.