rpms/waf/F-12 waf-1.5.15-libdir.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 import.log, 1.15, 1.16 sources, 1.20, 1.21 waf.spec, 1.24, 1.25 waf-1.5.14-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/waf/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24003/F-12

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

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

--- NEW FILE waf-1.5.15-libdir.patch ---
diff --git a/waf-light b/waf-light
index 2068d44..c4ed3e6 100755
--- a/waf-light
+++ b/waf-light
@@ -127,7 +127,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 8313ad3..02a7b6a 100644
--- a/wscript
+++ b/wscript
@@ -313,7 +313,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/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	7 Mar 2010 21:34:27 -0000	1.20
+++ .cvsignore	5 Apr 2010 16:17:49 -0000	1.21
@@ -1 +1 @@
-waf-1.5.14.stripped.tar.bz2
+waf-1.5.15.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	7 Mar 2010 21:34:27 -0000	1.15
+++ import.log	5 Apr 2010 16:17:49 -0000	1.16
@@ -13,3 +13,4 @@ waf-1_5_11-1_fc12:F-12:waf-1.5.11-1.fc12
 waf-1_5_12-1_fc12:F-12:waf-1.5.12-1.fc12.src.rpm:1266171780
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	7 Mar 2010 21:34:27 -0000	1.20
+++ sources	5 Apr 2010 16:17:49 -0000	1.21
@@ -1 +1 @@
-d57c6c3778dba5c53c364dcedbcfb67c  waf-1.5.14.stripped.tar.bz2
+0367a0d3b499ec27b5c3d296bda8bb0b  waf-1.5.15.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/waf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- waf.spec	7 Mar 2010 21:34:27 -0000	1.24
+++ waf.spec	5 Apr 2010 16:17:49 -0000	1.25
@@ -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
 # 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/wafadmi
 %{__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
 
 
 %changelog
+* Mon Apr  5 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.15-1
+- Update to 1.5.15.
+
 * Sun Mar  7 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.14-1
 - Update to 1.5.14.
 


--- waf-1.5.14-libdir.patch DELETED ---