diff --git a/.gitignore b/.gitignore index 46ca528..b672750 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /waf-1.7.0pre4.stripped.tar.bz2 /waf-1.7.0pre5.stripped.tar.bz2 /waf-1.7.0.stripped.tar.bz2 +/waf-1.7.1.stripped.tar.bz2 diff --git a/repack.sh b/repack.sh index ff13c50..0a22218 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.7.0 +version=1.7.1 prerel= src=waf-${version}${prerel}.tar.bz2 diff --git a/sources b/sources index d538106..50a935e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9162a5c2a33c2f5201d7e0806604cd42 waf-1.7.0.stripped.tar.bz2 +146a88f9d3abbf8f903604fff476c44a waf-1.7.1.stripped.tar.bz2 diff --git a/waf.spec b/waf.spec index a611317..ccb5bdd 100644 --- a/waf.spec +++ b/waf.spec @@ -1,4 +1,4 @@ -%if (! 0%{?rhel}) || 0%{?rhel} > 6 +%if 0%{?fedora} %global with_python3 1 # Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -13,8 +13,8 @@ %undefine prerel Name: waf -Version: 1.7.0 -Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}.2 +Version: 1.7.1 +Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?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) @@ -36,7 +36,7 @@ BuildRequires: python-devel BuildRequires: python3-devel %endif # with_python3 %if 0%{?with_docs} -%if 0%{?fedora > 13} +%if 0%{?fedora} BuildRequires: python-sphinx %else BuildRequires: python-sphinx10 @@ -209,6 +209,10 @@ rm -rf %{buildroot} %changelog +* Sat Aug 4 2012 Thomas Moschny - 1.7.1-1 +- Update to 1.7.1. +- Remove rhel logic from with_python3 conditional. + * Sat Aug 04 2012 David Malcolm - 1.7.0-1.2 - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3