diff --git a/repack.sh b/repack.sh index adc405a..c6da3f4 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.6.2 +version=1.6.3 src=waf-${version}.tar.bz2 dst=${src%.tar.bz2}.stripped.tar.bz2 diff --git a/waf-1.6.2-extras-boost-syntax.patch b/waf-1.6.2-extras-boost-syntax.patch deleted file mode 100644 index 6fb6ae0..0000000 --- a/waf-1.6.2-extras-boost-syntax.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: waflib/extras/boost.py -=================================================================== ---- waflib/extras/boost.py (revision 10894) -+++ waflib/extras/boost.py (revision 10895) -@@ -319,7 +319,7 @@ - self.start_msg(kw.get('msg_includes', 'Checking for boost include path')) - ret = self.find_boost_includes(kw) - -- except Errors.ConfigurationError, e: -+ except Errors.ConfigurationError as e: - if 'errmsg' in kw: - self.end_msg(kw['errmsg'], 'YELLOW') - raise e -@@ -331,7 +331,7 @@ - self.start_msg('Checking for library boost_'+lib) - try: - self.find_boost_library(lib, kw) -- except Errors.ConfigurationError, e: -+ except Errors.ConfigurationError as e: - ret = False - if 'errmsg' in kw: - self.end_msg(kw['errmsg'], 'YELLOW') diff --git a/waf.spec b/waf.spec index c493b67..53beef0 100644 --- a/waf.spec +++ b/waf.spec @@ -10,8 +10,8 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: waf -Version: 1.6.2 -Release: 5%{?dist} +Version: 1.6.3 +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) @@ -24,8 +24,6 @@ URL: http://code.google.com/p/waf/ Source: waf-%{version}.stripped.tar.bz2 # use _datadir instead of /usr/lib Patch0: waf-1.6.2-libdir.patch -# upstream r10895 -Patch1: waf-1.6.2-extras-boost-syntax.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python-devel @@ -57,7 +55,6 @@ Autotools, Scons, CMake or Ant. %prep %setup -q %patch0 -p0 -b .libdir -%patch1 -p0 -b .py3k %build @@ -137,6 +134,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 19 2011 Thomas Moschny - 1.6.3-1 +- Update to 1.6.3. + * Mon Feb 07 2011 Fedora Release Engineering - 1.6.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild