rpms/waf/devel waf-1.5.12-libdir.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 import.log, 1.12, 1.13 sources, 1.17, 1.18 waf.spec, 1.21, 1.22 waf-1.5.11-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-serv19877/devel

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

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

--- NEW FILE waf-1.5.12-libdir.patch ---
diff --git a/waf-light b/waf-light
index 471b4f1..65a886b 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 b9eebdc..9bbcdec 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('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	19 Jan 2010 08:16:05 -0000	1.17
+++ .cvsignore	14 Feb 2010 17:51:06 -0000	1.18
@@ -1 +1 @@
-waf-1.5.11.stripped.tar.bz2
+waf-1.5.12.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	19 Jan 2010 08:16:05 -0000	1.12
+++ import.log	14 Feb 2010 17:51:06 -0000	1.13
@@ -10,3 +10,4 @@ waf-1_5_8-1_fc11:HEAD:waf-1.5.8-1.fc11.s
 waf-1_5_9-1_fc11:HEAD:waf-1.5.9-1.fc11.src.rpm:1251738819
 waf-1_5_10-1_fc12:HEAD:waf-1.5.10-1.fc12.src.rpm:1258443992
 waf-1_5_11-1_fc12:HEAD:waf-1.5.11-1.fc12.src.rpm:1263888781
+waf-1_5_12-1_fc12:HEAD:waf-1.5.12-1.fc12.src.rpm:1266169833


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	19 Jan 2010 08:16:05 -0000	1.17
+++ sources	14 Feb 2010 17:51:06 -0000	1.18
@@ -1 +1 @@
-66e1e46e6f8535a1633a1c4f7ff2fa5e  waf-1.5.11.stripped.tar.bz2
+c57cfa5d3983aa897752a16be9982681  waf-1.5.12.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- waf.spec	19 Jan 2010 08:16:05 -0000	1.21
+++ waf.spec	14 Feb 2010 17:51:06 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.11
+Version:        1.5.12
 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.11-libdir.patch
+Patch0:         waf-1.5.12-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,9 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* Sun Feb 14 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.12-1
+- Update to 1.5.12.
+
 * Mon Jan 18 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.11-1
 - Update to 1.5.11.
 - Use %%global instead of %%define.


--- waf-1.5.11-libdir.patch DELETED ---