From ebb6414e467b9ebb92a841cff54b6c6d649c9a12 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 31 Aug 2009 17:18:12 +0000 Subject: [PATCH] Update to 1.5.9. --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- waf-1.5.4-libdir.patch => waf-1.5.9-libdir.patch | 16 ++++++++-------- waf.spec | 10 +++++++--- 5 files changed, 18 insertions(+), 13 deletions(-) rename waf-1.5.4-libdir.patch => waf-1.5.9-libdir.patch (55%) diff --git a/.cvsignore b/.cvsignore index 0f8229f..54b5324 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -waf-1.5.8.stripped.tar.bz2 +waf-1.5.9.stripped.tar.bz2 diff --git a/import.log b/import.log index 905b729..ddc3d0e 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.src.rpm:1239132971 waf-1_5_5-1_fc10:HEAD:waf-1.5.5-1.fc10.src.rpm:1240670795 waf-1_5_6-1_fc11:HEAD:waf-1.5.6-1.fc11.src.rpm:1241507304 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 diff --git a/sources b/sources index 4f01c39..b1b5964 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a52604ec1cd7560c18abdf4c6bd00897 waf-1.5.8.stripped.tar.bz2 +e48e739fedb19321b7fb8925d4b2bc45 waf-1.5.9.stripped.tar.bz2 diff --git a/waf-1.5.4-libdir.patch b/waf-1.5.9-libdir.patch similarity index 55% rename from waf-1.5.4-libdir.patch rename to waf-1.5.9-libdir.patch index 61d56ac..794be00 100644 --- a/waf-1.5.4-libdir.patch +++ b/waf-1.5.9-libdir.patch @@ -1,7 +1,7 @@ -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(): +diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light +--- waf-1.5.9/waf-light.orig 2009-08-29 15:32:07.000000000 +0200 ++++ waf-1.5.9/waf-light 2009-08-31 19:08:19.000000000 +0200 +@@ -123,7 +123,7 @@ def find_lib(): if w: return w err("waf-light requires wafadmin -> export WAFDIR=/folder") @@ -10,10 +10,10 @@ diff -up waf-1.5.4/waf-light.orig waf-1.5.4/waf-light for i in [INSTALL,'/usr','/usr/local','/opt']: w = test(i+dir) if w: return w -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): +diff -up waf-1.5.9/wscript.orig waf-1.5.9/wscript +--- waf-1.5.9/wscript.orig 2009-08-29 15:32:07.000000000 +0200 ++++ waf-1.5.9/wscript 2009-08-31 19:08:19.000000000 +0200 +@@ -317,7 +317,7 @@ def build(bld): if val != True and val != "y": sys.exit(1) create_waf() diff --git a/waf.spec b/waf.spec index d6caf83..ea0fd3d 100644 --- a/waf.spec +++ b/waf.spec @@ -1,6 +1,6 @@ Name: waf -Version: 1.5.8 -Release: 2%{?dist} +Version: 1.5.9 +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.4-libdir.patch +Patch0: waf-1.5.9-libdir.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python-devel @@ -83,6 +83,10 @@ find demos utils -type f -exec %{__chmod} 0644 {} \; %changelog +* Mon Aug 31 2009 Thomas Moschny - 1.5.9-1 +- Update to 1.5.9. +- Rebase libdir patch. + * Mon Jul 27 2009 Fedora Release Engineering - 1.5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild