From d4f1055bd0d993db5d61b10817e02c98127b70ac Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 7 Apr 2009 19:37:02 +0000 Subject: [PATCH] Update to 1.5.4. --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- ....5.2-libdir.patch => waf-1.5.4-libdir.patch | 18 +++++++++--------- waf.spec | 9 ++++++--- 5 files changed, 18 insertions(+), 14 deletions(-) rename waf-1.5.2-libdir.patch => waf-1.5.4-libdir.patch (50%) diff --git a/.cvsignore b/.cvsignore index 8893cab..b88faf9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -waf-1.5.3.stripped.tar.bz2 +waf-1.5.4.stripped.tar.bz2 diff --git a/import.log b/import.log index d40d425..2217cd5 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ waf-1_4_4-1_fc9:HEAD:waf-1.4.4-1.fc9.src.rpm:1220215604 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 diff --git a/sources b/sources index 3e0ee85..69a804a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -423c8b5919bcb0cbee0edc993d694dcc waf-1.5.3.stripped.tar.bz2 +35ba50ea6bdcb711d48d1c8842da1750 waf-1.5.4.stripped.tar.bz2 diff --git a/waf-1.5.2-libdir.patch b/waf-1.5.4-libdir.patch similarity index 50% rename from waf-1.5.2-libdir.patch rename to waf-1.5.4-libdir.patch index b399d12..61d56ac 100644 --- a/waf-1.5.2-libdir.patch +++ b/waf-1.5.4-libdir.patch @@ -1,19 +1,19 @@ -diff -up waf-1.5.2/waf-light.orig waf-1.5.2/waf-light ---- waf-1.5.2/waf-light.orig 2008-12-22 00:31:57.000000000 +0100 -+++ waf-1.5.2/waf-light 2009-01-16 17:13:00.000000000 +0100 -@@ -102,7 +102,7 @@ def find_lib(): +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/waf-%s-%s/" % (VERSION, REVISION) +- 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.2/wscript.orig waf-1.5.2/wscript ---- waf-1.5.2/wscript.orig 2008-12-22 00:31:57.000000000 +0100 -+++ waf-1.5.2/wscript 2009-01-16 17:13:00.000000000 +0100 -@@ -318,7 +318,7 @@ def build(bld): +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() diff --git a/waf.spec b/waf.spec index 0bca657..e4b9c0f 100644 --- a/waf.spec +++ b/waf.spec @@ -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 @@ URL: http://code.google.com/p/waf/ # 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 @@ find demos utils -type f -exec %{__chmod} 0644 {} \; %changelog +* Tue Apr 7 2009 Thomas Moschny - 1.5.4-1 +- Update to 1.5.4. + * Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild