diff --git a/.gitignore b/.gitignore index a364281..7d8d6d0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /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 diff --git a/repack.sh b/repack.sh index b7b7fe5..721ae45 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.8.14 +version=1.8.15 prerel= src=waf-${version}${prerel}.tar.bz2 diff --git a/sources b/sources index c84cc45..438cc3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1c7c61b37872d15496dbb4a4ec256d9 waf-1.8.14.stripped.tar.bz2 +5f3325df07fdd4c73225fd00fc09a989 waf-1.8.15.stripped.tar.bz2 diff --git a/waf-1.8.15-sphinx-theme.patch b/waf-1.8.15-sphinx-theme.patch new file mode 100644 index 0000000..a523524 --- /dev/null +++ b/waf-1.8.15-sphinx-theme.patch @@ -0,0 +1,16 @@ +diff -up waf-1.8.15/docs/sphinx/conf.py.orig waf-1.8.15/docs/sphinx/conf.py +--- waf-1.8.15/docs/sphinx/conf.py.orig 2015-10-20 09:27:38.787867271 +0200 ++++ waf-1.8.15/docs/sphinx/conf.py 2015-10-24 12:29:30.497809066 +0200 +@@ -396,7 +396,11 @@ 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' ++from sphinx import version_info ++if (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 553683c..2485ec8 100644 --- a/waf.spec +++ b/waf.spec @@ -13,7 +13,7 @@ %undefine prerel Name: waf -Version: 1.8.14 +Version: 1.8.15 Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist} Summary: A Python-based build system Group: Development/Tools @@ -30,6 +30,7 @@ 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 @@ -111,6 +112,8 @@ 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 @@ -209,6 +212,9 @@ rm -f docs/sphinx/build/html/.buildinfo %changelog +* Sat Oct 24 2015 Thomas Moschny - 1.8.15-1 +- Update to 1.8.15. + * Sun Oct 11 2015 Thomas Moschny - 1.8.14-1 - Update to 1.8.14. - Include waf-2 and waf-3 symlinks, respectively.