[packages/waf] rediff patch; rel 2

atler atler at pld-linux.org
Sun Feb 28 23:25:19 CET 2021


commit 0e175ac5c8e5841a559dd0820c0b88f1482b0b26
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Feb 28 23:25:06 2021 +0100

    rediff patch; rel 2

 waf-path.patch | 10 ++++++----
 waf.spec       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/waf.spec b/waf.spec
index 57713b2..0fbc40f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -2,7 +2,7 @@ Summary:	The Waf build system
 Summary(pl.UTF-8):	System budowania Waf
 Name:		waf
 Version:	2.0.22
-Release:	1
+Release:	2
 # note: waf book is on CC-BY-NC-ND (not included in binary package)
 License:	BSD
 Group:		Development/Building
diff --git a/waf-path.patch b/waf-path.patch
index 38ec6a6..9d087f0 100644
--- a/waf-path.patch
+++ b/waf-path.patch
@@ -4,7 +4,7 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  # encoding: latin-1
- # Thomas Nagy, 2005-2017
+ # Thomas Nagy, 2005-2018
  #
 @@ -34,7 +34,7 @@
  REVISION="x"
@@ -15,8 +15,8 @@
  C2='x'
  C3='x'
  cwd = os.getcwd()
-@@ -140,7 +140,7 @@ def find_lib():
- 		if w: return w
+@@ -140,9 +140,9 @@ def find_lib():
+ 				return dir
  		err('waf-light requires waflib -> export WAFDIR=/folder')
  
 -	dirname = '%s-%s-%s' % (WAF, VERSION, REVISION)
@@ -26,11 +26,13 @@
 +	for i in (INSTALL,'/usr/lib','/usr/local/lib','/opt'):
 +		w = test(i + '/' + dirname)
  		if w: return w
+ 
+ 	#waf-local
 --- waf-1.6.4/wscript.orig	2011-04-17 12:02:50.000000000 +0200
 +++ waf-1.6.4/wscript	2011-05-01 07:00:51.030153869 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! /usr/bin/python
  # encoding: utf-8
- # Thomas Nagy, 2005-2010
+ # Thomas Nagy, 2005-2018
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/waf.git/commitdiff/0e175ac5c8e5841a559dd0820c0b88f1482b0b26



More information about the pld-cvs-commit mailing list