Notification time stamped 2022-02-22 08:33:43 UTC
From 5e71212521a5ad6c73e0f9616f042a2c87fdb1b2 Mon Sep 17 00:00:00 2001 From: Thomas Moschny thm@fedoraproject.org Date: Feb 14 2010 17:51:06 +0000 Subject: Update to 1.5.12.
---
diff --git a/.cvsignore b/.cvsignore index 4b9be3e..4134f75 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -waf-1.5.11.stripped.tar.bz2 +waf-1.5.12.stripped.tar.bz2 diff --git a/import.log b/import.log index 0bef9ba..026a40f 100644 --- a/import.log +++ b/import.log @@ -10,3 +10,4 @@ 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:HEAD:waf-1.5.10-1.fc12.src.rpm:1258443992 waf-1_5_11-1_fc12:HEAD:waf-1.5.11-1.fc12.src.rpm:1263888781 +waf-1_5_12-1_fc12:HEAD:waf-1.5.12-1.fc12.src.rpm:1266169833 diff --git a/sources b/sources index c7f3015..2597964 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66e1e46e6f8535a1633a1c4f7ff2fa5e waf-1.5.11.stripped.tar.bz2 +c57cfa5d3983aa897752a16be9982681 waf-1.5.12.stripped.tar.bz2 diff --git a/waf-1.5.11-libdir.patch b/waf-1.5.11-libdir.patch deleted file mode 100644 index ebbc1f2..0000000 --- a/waf-1.5.11-libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -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']) diff --git a/waf-1.5.12-libdir.patch b/waf-1.5.12-libdir.patch new file mode 100644 index 0000000..353d318 --- /dev/null +++ b/waf-1.5.12-libdir.patch @@ -0,0 +1,26 @@ +diff --git a/waf-light b/waf-light +index 471b4f1..65a886b 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 b9eebdc..9bbcdec 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']) diff --git a/waf.spec b/waf.spec index 5b7e04f..476089a 100644 --- a/waf.spec +++ b/waf.spec @@ -1,5 +1,5 @@ Name: waf -Version: 1.5.11 +Version: 1.5.12 Release: 1%{?dist} Summary: A Python-based build system Group: Development/Tools @@ -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.11-libdir.patch +Patch0: waf-1.5.12-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 +* Sun Feb 14 2010 Thomas Moschny thomas.moschny@gmx.de - 1.5.12-1 +- Update to 1.5.12. + * Mon Jan 18 2010 Thomas Moschny thomas.moschny@gmx.de - 1.5.11-1 - Update to 1.5.11. - Use %%global instead of %%define.
https://src.fedoraproject.org/rpms/waf/c/5e71212521a5ad6c73e0f9616f042a2c87f...
scm-commits@lists.fedoraproject.org