rpms/waf/F-11 waf-1.5.9-libdir.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 import.log, 1.9, 1.10 sources, 1.14, 1.15 waf.spec, 1.17, 1.18 waf-1.5.4-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/waf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8761/F-11

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

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

--- NEW FILE waf-1.5.9-libdir.patch ---
diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light
--- waf-1.5.9/waf-light.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/waf-light	2009-08-31 19:08:19.000000000 +0200
@@ -123,7 +123,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 -up waf-1.5.9/wscript.orig waf-1.5.9/wscript
--- waf-1.5.9/wscript.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/wscript	2009-08-31 19:08:19.000000000 +0200
@@ -317,7 +317,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.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Jun 2009 09:39:43 -0000	1.14
+++ .cvsignore	31 Aug 2009 17:24:36 -0000	1.15
@@ -1 +1 @@
-waf-1.5.8.stripped.tar.bz2
+waf-1.5.9.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	25 Jun 2009 09:39:43 -0000	1.9
+++ import.log	31 Aug 2009 17:24:36 -0000	1.10
@@ -7,3 +7,4 @@ waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.s
 waf-1_5_5-1_fc10:F-11:waf-1.5.5-1.fc10.src.rpm:1240671397
 waf-1_5_6-1_fc11:F-11:waf-1.5.6-1.fc11.src.rpm:1241507587
 waf-1_5_8-1_fc12:F-11:waf-1.5.8-1.fc12.src.rpm:1245922710
+waf-1_5_9-1_fc11:F-11:waf-1.5.9-1.fc11.src.rpm:1251739433


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Jun 2009 09:39:43 -0000	1.14
+++ sources	31 Aug 2009 17:24:36 -0000	1.15
@@ -1 +1 @@
-a52604ec1cd7560c18abdf4c6bd00897  waf-1.5.8.stripped.tar.bz2
+e48e739fedb19321b7fb8925d4b2bc45  waf-1.5.9.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/waf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- waf.spec	25 Jun 2009 09:39:43 -0000	1.17
+++ waf.spec	31 Aug 2009 17:24:36 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.8
+Version:        1.5.9
 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.4-libdir.patch
+Patch0:         waf-1.5.9-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,13 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.9-1
+- Update to 1.5.9.
+- Rebase libdir patch.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.8-1
 - Update to 1.5.8.
 


--- waf-1.5.4-libdir.patch DELETED ---