rediff patch; rel 2

diff --git a/waf-path.patch b/waf-path.patch
index 38ec6a6ab5ecae0f5229696eaeeb6d29ea3e707e..9d087f0bc5367d3952e84bfb83184d64a1064722 100644 (file)
--- 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
  

diff --git a/waf.spec b/waf.spec
index 57713b25796c3fccbfffe31478aa43e4564d9bde..0fbc40fd392b13d1478176cd9936ed1715961f7c 100644 (file)
--- 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