From 568dddb1dddc165268089912bd7e104959c24246 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sun, 12 Oct 2014 11:01:59 +0200
Subject: [PATCH] Update to 1.8.2.

---
 .gitignore |  1 +
 repack.sh  |  4 +++-
 sources    |  2 +-
 waf.spec   | 21 +++++++--------------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2cc9f2f..ce42f0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /waf-1.7.14.stripped.tar.bz2
 /waf-1.7.15.stripped.tar.bz2
 /waf-1.7.16.stripped.tar.bz2
+/waf-1.8.2.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 9e4a260..e7892cc 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.7.16
+version=1.8.2
 prerel=
 
 src=waf-${version}${prerel}.tar.bz2
@@ -16,4 +16,6 @@ tar --delete --file=${dst%.bz2} \
      waf-${version}/docs/sphinx/_images/waf-64x64.png \
      waf-${version}/docs/slides/presentation/gfx/waflogo.svg
 
+touch -m -r ${src} ${dst%.bz2}
+
 bzip2 ${dst%.bz2}
diff --git a/sources b/sources
index 16eaf33..278922e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1be4736dfaa590e80ed55adbda203a1f  waf-1.7.16.stripped.tar.bz2
+00f4e60b66adfd6e256c913046cf79d4  waf-1.8.2.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 39489eb..9713a39 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,8 +13,8 @@
 %undefine prerel
 
 Name:           waf
-Version:        1.7.16
-Release:        %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}.2
+Version:        1.8.2
+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}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  python-sphinx
 %else
 BuildRequires:  python-sphinx10
@@ -108,16 +108,6 @@ This package contains the HTML documentation for %{name}.
 # do not try to use the (removed) waf logos
 %patch1 -p1
 
-# remove BOM, causes trouble later
-sed -i -e '1s/^\xEF\xBB\xBF//' waflib/extras/dpapi.py
-
-# add missing quotes, see rhbz#914566 and
-# https://code.google.com/p/waf/issues/detail?id=1263
-sed -i -e 's@fontname=\(Vera.*sans\),@fontname="\1",@g' \
-  docs/sphinx/conf.py \
-  docs/sphinx/coremodules.rst \
-  docs/sphinx/featuremap.rst
-
 
 %build
 extras=
@@ -132,7 +122,7 @@ done
 %if 0%{?with_docs}
 # build html docs
 pushd docs/sphinx
-%if ! 0%{?fedora > 13}
+%if ! ( 0%{?fedora} || 0%{?rhel} >= 7 )
 export SPHINX_BUILD=sphinx-1.0-build
 %endif
 ../../waf -v configure build
@@ -209,6 +199,9 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 
 %changelog
+* Sun Oct 12 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.2-1
+- Update to 1.8.2.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.16-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild