rpms/waf/F-12 waf-1.5.11-libdir.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 import.log, 1.11, 1.12 sources, 1.16, 1.17 waf.spec, 1.20, 1.21 waf-1.5.9-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

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

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

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

--- NEW FILE waf-1.5.11-libdir.patch ---
diff --git a/waf-light b/waf-light
index 2b8f9a9..0bde2fa 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 42c39e9..2b3b42d 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/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	17 Nov 2009 07:53:31 -0000	1.16
+++ .cvsignore	19 Jan 2010 08:18:25 -0000	1.17
@@ -1 +1 @@
-waf-1.5.10.stripped.tar.bz2
+waf-1.5.11.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	17 Nov 2009 07:53:31 -0000	1.11
+++ import.log	19 Jan 2010 08:18:25 -0000	1.12
@@ -9,3 +9,4 @@ waf-1_5_6-1_fc11:HEAD:waf-1.5.6-1.fc11.s
 waf-1_5_8-1_fc11:HEAD:waf-1.5.8-1.fc11.src.rpm:1244757177
 waf-1_5_9-1_fc11:HEAD:waf-1.5.9-1.fc11.src.rpm:1251738819
 waf-1_5_10-1_fc12:F-12:waf-1.5.10-1.fc12.src.rpm:1258444381
+waf-1_5_11-1_fc12:F-12:waf-1.5.11-1.fc12.src.rpm:1263888931


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	17 Nov 2009 07:53:31 -0000	1.16
+++ sources	19 Jan 2010 08:18:25 -0000	1.17
@@ -1 +1 @@
-68b6bfcfd93739e3e242254cfde3e051  waf-1.5.10.stripped.tar.bz2
+66e1e46e6f8535a1633a1c4f7ff2fa5e  waf-1.5.11.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-12/waf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- waf.spec	17 Nov 2009 07:53:31 -0000	1.20
+++ waf.spec	19 Jan 2010 08:18:25 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.10
+Version:        1.5.11
 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.9-libdir.patch
+Patch0:         waf-1.5.11-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -23,8 +23,8 @@ Requires:       python-abi %(%{__python}
 
 # the demo suite contains a perl module, which draws in unwanted
 # provides and requires
-%define __perl_provides %{nil}
-%define __perl_requires %{nil}
+%global __perl_provides %{nil}
+%global __perl_requires %{nil}
 
 
 %description
@@ -83,6 +83,10 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* 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.
+
 * Mon Nov 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.10-1
 - Update to 1.5.10.
 


--- waf-1.5.9-libdir.patch DELETED ---