From 9f952ac49cc51a63fa5075e33381ae3b33de9e10 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sat, 26 Nov 2011 15:00:46 +0100
Subject: [PATCH] Update to 1.6.9. Patch to not use the logo (which has been
 removed) in the docs.

---
 .gitignore           |  1 +
 repack.sh            |  7 +++++--
 sources              |  2 +-
 waf-1.6.9-logo.patch | 12 ++++++++++++
 waf.spec             |  8 +++++++-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 waf-1.6.9-logo.patch

diff --git a/.gitignore b/.gitignore
index 13e2821..3104011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ waf-1.5.18.stripped.tar.bz2
 /waf-1.6.4.stripped.tar.bz2
 /waf-1.6.6.stripped.tar.bz2
 /waf-1.6.8.stripped.tar.bz2
+/waf-1.6.9.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 694119a..6fc086c 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.6.8
+version=1.6.9
 
 src=waf-${version}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
@@ -12,6 +12,9 @@ bzip2 -d ${dst}
 
 tar --delete --file=${dst%.bz2} \
      waf-${version}/docs/book \
-     waf-${version}/waflib/extras/subprocess.py
+     waf-${version}/waflib/extras/subprocess.py \
+     waf-${version}/docs/sphinx/_images/waf-64x64.png \
+     waf-${version}/docs/gfx/waflogo.svg \
+     waf-${version}/docs/slides/presentation/gfx/waflogo.svg
 
 bzip2 ${dst%.bz2}
diff --git a/sources b/sources
index b68777c..432a0ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a27fd4c936a2dc608ff203da9cce0742  waf-1.6.8.stripped.tar.bz2
+7af2af06813a366eba6fabc76cee47e5  waf-1.6.9.stripped.tar.bz2
diff --git a/waf-1.6.9-logo.patch b/waf-1.6.9-logo.patch
new file mode 100644
index 0000000..4dc73ed
--- /dev/null
+++ b/waf-1.6.9-logo.patch
@@ -0,0 +1,12 @@
+diff -up waf-1.6.9/docs/sphinx/conf.py.orig waf-1.6.9/docs/sphinx/conf.py
+--- waf-1.6.9/docs/sphinx/conf.py.orig	2011-11-20 15:51:43.000000000 +0100
++++ waf-1.6.9/docs/sphinx/conf.py	2011-11-26 14:27:33.996165116 +0100
+@@ -415,7 +415,7 @@ html_theme = 'default'
+ 
+ # The name of an image file (relative to this directory) to place at the top
+ # of the sidebar.
+-html_logo = '_images/waf-64x64.png'
++#html_logo = '_images/waf-64x64.png'
+ 
+ # The name of an image file (within the static path) to use as favicon of the
+ # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
diff --git a/waf.spec b/waf.spec
index f850a76..219e4fe 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,7 +10,7 @@
 %global with_docs 1
 
 Name:           waf
-Version:        1.6.8
+Version:        1.6.9
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -28,6 +28,7 @@ Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.6.2-libdir.patch
 Patch1:         waf-1.6.8-syntax.patch
+Patch2:         waf-1.6.9-logo.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -98,6 +99,7 @@ This package contains the HTML documentation for %{name}.
 %setup -q
 %patch0 -p0 -b .libdir
 %patch1 -p1 -b .syntax
+%patch2 -p1 -b .logo
 
 
 %build
@@ -199,6 +201,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Nov 26 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.9-1
+- Update to 1.6.9.
+- Patch to not use the logo (which has been removed) in the docs.
+
 * Mon Oct  3 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.6.8-1
 - Update to 1.6.8.
 - Use rpm 4.9.X style provides/requires filtering.