[4.0] d8a5c8b Filter the list and add forgotten python-sphinx.

[Lasse Karstensen]

commit d8a5c8b9d3ebce1bda2a70290c148f721f9fdb31
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Wed Jul 9 14:56:07 2014 +0200

    Filter the list and add forgotten python-sphinx.
    
    We only need debhelper when building the debian packages,
    and the systemd-units is within a conditional that awk ignores.
    
    Updated the commands to not include these in the future, and also
    the Redhat spec file so it should work on a fresh installation.
    
    Noticed by:	fgs

diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index c9dd0c5..d93e2b5 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -76,11 +76,10 @@ Build dependencies on Debian / Ubuntu
 In order to build Varnish from source you need a number of packages
 installed. On a Debian or Ubuntu system these are:
 
-..  grep-dctrl -n -sBuild-Depends -r ^ ../../../../varnish-cache-debian/control | tr -d '\n' | awk -F,\  '{ for (i = 0; ++i <= NF;) { sub (/ .*/, "", $i); print "* `" $i "`"; }}'
+..  grep-dctrl -n -sBuild-Depends -r ^ ../../../../varnish-cache-debian/control | tr -d '\n' | awk -F,\  '{ for (i = 0; ++i <= NF;) { sub (/ .*/, "", $i); print "* `" $i "`"; }}' | egrep -v '(debhelper)'
 
 * `automake`
 * `autotools-dev`
-* `debhelper`
 * `libedit-dev`
 * `libjemalloc-dev`
 * `libncurses-dev`
@@ -98,7 +97,7 @@ Build dependencies on Red Hat / CentOS
 To build Varnish on a Red Hat or CentOS system you need the following
 packages installed:
 
-.. gawk '/^BuildRequires/ {print "* `" $2 "`"}' ../../../redhat/varnish.spec | sort | uniq
+.. gawk '/^BuildRequires/ {print "* `" $2 "`"}' ../../../redhat/varnish.spec | sort | uniq | egrep -v '(systemd)'
 
 * `autoconf`
 * `automake`
@@ -109,7 +108,7 @@ packages installed:
 * `pcre-devel`
 * `pkgconfig`
 * `python-docutils`
-* `systemd-units`
+* `python-sphinx`
 
 
 Compiling Varnish
diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index eda06ba..df75267 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -23,6 +23,7 @@ BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: python-docutils >= 0.6
+BuildRequires: python-sphinx
 Requires: jemalloc
 Requires: libedit
 Requires: logrotate