diff --git a/.cvsignore b/.cvsignore index 4134f75..79fd516 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -waf-1.5.12.stripped.tar.bz2 +waf-1.5.13.stripped.tar.bz2 diff --git a/import.log b/import.log index 2f6d5c0..0159d85 100644 --- a/import.log +++ b/import.log @@ -11,3 +11,4 @@ waf-1_5_9-1_fc11:HEAD:waf-1.5.9-1.fc11.src.rpm:1251738819 waf-1_5_10-1_fc12:F-12:waf-1.5.10-1.fc12.src.rpm:1258444381 waf-1_5_11-1_fc12:F-12:waf-1.5.11-1.fc12.src.rpm:1263888931 waf-1_5_12-1_fc12:F-12:waf-1.5.12-1.fc12.src.rpm:1266171780 +waf-1_5_13-1_fc12:F-12:waf-1.5.13-1.fc12.src.rpm:1267655304 diff --git a/sources b/sources index 2597964..44a2d3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c57cfa5d3983aa897752a16be9982681 waf-1.5.12.stripped.tar.bz2 +5578e758437ad3af563b625ca448034b waf-1.5.13.stripped.tar.bz2 diff --git a/waf-1.5.12-libdir.patch b/waf-1.5.12-libdir.patch deleted file mode 100644 index 353d318..0000000 --- a/waf-1.5.12-libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-1.5.13-libdir.patch b/waf-1.5.13-libdir.patch new file mode 100644 index 0000000..4697aba --- /dev/null +++ b/waf-1.5.13-libdir.patch @@ -0,0 +1,26 @@ +diff --git a/waf-light b/waf-light +index f828e0e..b116d40 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 8343ac7..5b45aa3 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 476089a..40f2de5 100644 --- a/waf.spec +++ b/waf.spec @@ -1,5 +1,5 @@ Name: waf -Version: 1.5.12 +Version: 1.5.13 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.12-libdir.patch +Patch0: waf-1.5.13-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 +* Wed Mar 3 2010 Thomas Moschny - 1.5.13-1 +- Update to 1.5.13. + * Sun Feb 14 2010 Thomas Moschny - 1.5.12-1 - Update to 1.5.12.