rpms/waf/EL-6 waf-1.5.17-install_3rdparty.patch, NONE, 1.1 waf-1.5.17-libdir.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 import.log, 1.16, 1.17 sources, 1.21, 1.22 waf.spec, 1.25, 1.26 waf-1.5.15-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/waf/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10611/EL-6

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.17-install_3rdparty.patch waf-1.5.17-libdir.patch 
Removed Files:
	waf-1.5.15-libdir.patch 
Log Message:
Update to 1.5.17.

waf-1.5.17-install_3rdparty.patch:
 wscript |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE waf-1.5.17-install_3rdparty.patch ---
diff --git a/wscript b/wscript
index 438dc4c..cc6557b 100644
--- a/wscript
+++ b/wscript
@@ -350,6 +350,10 @@ def build(bld):
 	tools.find_sources_in_dirs('wafadmin/Tools', exts=['.py'])
 	tools.install_path = os.path.join('${PREFIX}', dir, 'Tools')
 
+	thirdparty = bld(features = 'py')
+	thirdparty.find_sources_in_dirs('wafadmin/3rdparty', exts=['.py'])
+	thirdparty.install_path = os.path.join('${PREFIX}', dir, '3rdparty')
+
 	bld.install_files('${PREFIX}/bin', 'waf', chmod=0755)
 
 	#print "waf is now installed in %s [%s, %s]" % (prefix, wafadmindir, binpath)

waf-1.5.17-libdir.patch:
 waf-light |    2 +-
 wscript   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE waf-1.5.17-libdir.patch ---
diff --git a/waf-light b/waf-light
index 16131d7..f613966 100755
--- a/waf-light
+++ b/waf-light
@@ -131,7 +131,7 @@ def find_lib():
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff --git a/wscript b/wscript
index 3b02a42..438dc4c 100644
--- a/wscript
+++ b/wscript
@@ -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('share', 'waf', 'wafadmin')
 
 	wafadmin = bld(features = 'py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/EL-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	5 Apr 2010 16:17:49 -0000	1.21
+++ .cvsignore	3 Jul 2010 11:02:11 -0000	1.22
@@ -1 +1 @@
-waf-1.5.15.stripped.tar.bz2
+waf-1.5.17.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/EL-6/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	5 Apr 2010 16:17:49 -0000	1.16
+++ import.log	3 Jul 2010 11:02:11 -0000	1.17
@@ -14,3 +14,4 @@ waf-1_5_12-1_fc12:F-12:waf-1.5.12-1.fc12
 waf-1_5_13-1_fc12:F-12:waf-1.5.13-1.fc12.src.rpm:1267655304
 waf-1_5_14-1_fc12:F-12:waf-1.5.14-1.fc12.src.rpm:1267997636
 waf-1_5_15-1_fc12:F-12:waf-1.5.15-1.fc12.src.rpm:1270484236
+waf-1_5_17-1_fc12:EL-6:waf-1.5.17-1.fc12.src.rpm:1278154884


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/EL-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	5 Apr 2010 16:17:49 -0000	1.21
+++ sources	3 Jul 2010 11:02:11 -0000	1.22
@@ -1 +1 @@
-0367a0d3b499ec27b5c3d296bda8bb0b  waf-1.5.15.stripped.tar.bz2
+a83409465a1d5b0f1cf1b6504db1f015  waf-1.5.17.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/EL-6/waf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- waf.spec	5 Apr 2010 16:17:49 -0000	1.25
+++ waf.spec	3 Jul 2010 11:02:12 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.15
+Version:        1.5.17
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -12,7 +12,9 @@ URL:            http://code.google.com/p
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.15-libdir.patch
+Patch0:         waf-1.5.17-libdir.patch
+# patch from ticket 682
+Patch1:         waf-1.5.17-install_3rdparty.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -36,6 +38,7 @@ Autotools, Scons, CMake or Ant.
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .install_3rdparty
 
 
 %build
@@ -67,7 +70,7 @@ find demos utils -type f -exec %{__chmod
 
 # bash completion
 %{__install} -D -p -m 0644 utils/waf-completion.bash \
-  %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
+  %{buildroot}%{_sysconfdir}/bash_completion.d/waf-completion.bash
 
 
 %clean
@@ -83,6 +86,10 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* Mon May 24 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.17-1
+- Update to 1.5.17.
+- Add patch from issue 682 to install 3rd party tools.
+
 * Mon Apr  5 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.15-1
 - Update to 1.5.15.
 


--- waf-1.5.15-libdir.patch DELETED ---