rpms/waf/devel waf-1.5.4-libdir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 sources, 1.10, 1.11 waf.spec, 1.13, 1.14 waf-1.5.2-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7366/devel

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

waf-1.5.4-libdir.patch:

--- NEW FILE waf-1.5.4-libdir.patch ---
diff -up waf-1.5.4/waf-light.orig waf-1.5.4/waf-light
--- waf-1.5.4/waf-light.orig	2009-04-07 20:34:22.000000000 +0200
+++ waf-1.5.4/waf-light	2009-04-07 21:29:53.000000000 +0200
@@ -117,7 +117,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.4/wscript.orig waf-1.5.4/wscript
--- waf-1.5.4/wscript.orig	2009-04-07 20:34:22.000000000 +0200
+++ waf-1.5.4/wscript	2009-04-07 21:28:26.000000000 +0200
@@ -314,7 +314,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/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Feb 2009 20:57:04 -0000	1.10
+++ .cvsignore	7 Apr 2009 19:37:02 -0000	1.11
@@ -1 +1 @@
-waf-1.5.3.stripped.tar.bz2
+waf-1.5.4.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	2 Feb 2009 20:57:04 -0000	1.5
+++ import.log	7 Apr 2009 19:37:02 -0000	1.6
@@ -3,3 +3,4 @@
 waf-1_5_2-1_fc10:HEAD:waf-1.5.2-1.fc10.src.rpm:1232126058
 waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440
 waf-1_5_3-1_fc10:HEAD:waf-1.5.3-1.fc10.src.rpm:1233608182
+waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Feb 2009 20:57:04 -0000	1.10
+++ sources	7 Apr 2009 19:37:02 -0000	1.11
@@ -1 +1 @@
-423c8b5919bcb0cbee0edc993d694dcc  waf-1.5.3.stripped.tar.bz2
+35ba50ea6bdcb711d48d1c8842da1750  waf-1.5.4.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- waf.spec	25 Feb 2009 18:04:56 -0000	1.13
+++ waf.spec	7 Apr 2009 19:37:02 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           waf
-Version:        1.5.3
-Release:        2%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -12,7 +12,7 @@
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.2-libdir.patch
+Patch0:         waf-1.5.4-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Apr  7 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.4-1
+- Update to 1.5.4.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- waf-1.5.2-libdir.patch DELETED ---