From 9fd264fd76f7494f6f4b982ea6fd3457e04baabf Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Fri, 20 Nov 2015 20:00:12 +0100
Subject: [PATCH] Update to 1.8.16.

- Remove patch applied upstream.
---
 .gitignore                    | 31 +------------------------------
 repack.sh                     |  2 +-
 sources                       |  2 +-
 waf-1.8.15-sphinx-theme.patch | 20 --------------------
 waf.spec                      | 11 ++++++-----
 5 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100644 waf-1.8.15-sphinx-theme.patch

diff --git a/.gitignore b/.gitignore
index 7d8d6d0..618e166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1 @@
-/waf-1.6.11.stripped.tar.bz2
-/waf-1.7.0pre3.stripped.tar.bz2
-/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
-/waf-1.7.2.stripped.tar.bz2
-/waf-1.7.4.stripped.tar.bz2
-/waf-1.7.5.stripped.tar.bz2
-/waf-1.7.6.stripped.tar.bz2
-/waf-1.7.7.stripped.tar.bz2
-/waf-1.7.8.stripped.tar.bz2
-/waf-1.7.9.stripped.tar.bz2
-/waf-1.7.10.stripped.tar.bz2
-/waf-1.7.11.stripped.tar.bz2
-/waf-1.7.13.stripped.tar.bz2
-/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
-/waf-1.8.4.stripped.tar.bz2
-/waf-1.8.5.stripped.tar.bz2
-/waf-1.8.6.stripped.tar.bz2
-/waf-1.8.7.stripped.tar.bz2
-/waf-1.8.8.stripped.tar.bz2
-/waf-1.8.9.stripped.tar.bz2
-/waf-1.8.11.stripped.tar.bz2
-/waf-1.8.12.stripped.tar.bz2
-/waf-1.8.14.stripped.tar.bz2
-/waf-1.8.15.stripped.tar.bz2
+/waf-*.tar.bz2
diff --git a/repack.sh b/repack.sh
index 721ae45..e59e87e 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.8.15
+version=1.8.16
 prerel=
 
 src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 438cc3b..049e268 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f3325df07fdd4c73225fd00fc09a989  waf-1.8.15.stripped.tar.bz2
+005154f298c6c3d14ba35b2fe468d614  waf-1.8.16.stripped.tar.bz2
diff --git a/waf-1.8.15-sphinx-theme.patch b/waf-1.8.15-sphinx-theme.patch
deleted file mode 100644
index 115f3be..0000000
--- a/waf-1.8.15-sphinx-theme.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
-index 275fbcc..59a3214 100644
---- a/docs/sphinx/conf.py
-+++ b/docs/sphinx/conf.py
-@@ -396,7 +396,14 @@ pygments_style = 'sphinx'
- 
- # The theme to use for HTML and HTML Help pages.  See the documentation for
- # a list of builtin themes.
--html_theme = 'classic'
-+try:
-+	from sphinx import version_info
-+except ImportError:
-+	version_info = None
-+if version_info and (1, 3) <= version_info:
-+	html_theme = 'classic'
-+else:
-+	html_theme = 'default'
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
diff --git a/waf.spec b/waf.spec
index 1f51559..415969b 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,8 +13,8 @@
 %undefine prerel
 
 Name:           waf
-Version:        1.8.15
-Release:        %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}.1
+Version:        1.8.16
+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)
@@ -30,7 +30,6 @@ Source:         waf-%{version}%{?prerel}.stripped.tar.bz2
 Patch0:         waf-1.8.11-libdir.patch
 Patch1:         waf-1.6.9-logo.patch
 Patch2:         waf-1.8.11-sphinx-no-W.patch
-Patch3:         waf-1.8.15-sphinx-theme.patch
 
 BuildArch:      noarch
 
@@ -112,8 +111,6 @@ This package contains the HTML documentation for %{name}.
 %patch1 -p1
 # do not add -W when running sphinx-build
 %patch2 -p1
-# support sphinx < 1.3
-%patch3 -p1
 
 
 %build
@@ -212,6 +209,10 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 
 %changelog
+* Fri Nov 20 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.16-1
+- Update to 1.8.16.
+- Remove patch applied upstream.
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.15-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5