doc: Update CentOS6 doc to use puias repo for updated sphinx

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/doc/developer/Building_FRR_on_CentOS6.rst b/doc/developer/Building_FRR_on_CentOS6.rst
index ca18f743c49d60d8035337f69ecdc05b6f4bcbe2..4e7861ac5c3363a9eb0acad71a8e4e0be9bcc7d1 100644 (file)
--- a/doc/developer/Building_FRR_on_CentOS6.rst
+++ b/doc/developer/Building_FRR_on_CentOS6.rst
@@ -96,21 +96,27 @@ to python
 
 Install newer ``Sphinx-Build`` based on ``Python 2.7``
 
+Create a new repo ``/etc/yum.repos.d/puias6.repo`` with the following contents:
+
+::
+
+    ### Name: RPM Repository for RHEL 6 - PUIAS (used for Sphinx-Build)
+    ### URL: http://springdale.math.ias.edu/data/puias/computational
+    [puias-computational]
+    name = RPM Repository for RHEL 6 - Sphinx-Build
+    baseurl = http://springdale.math.ias.edu/data/puias/computational/$releasever/$basearch
+    #mirrorlist = 
+    enabled = 1
+    protect = 0
+    gpgkey = 
+    gpgcheck = 0
+
+Update rpm database & Install newer sphinx
+
 ::
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-babel-0.9.6-2.sdl6.1.noarch.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-jinja2-2.7.2-2.sdl6.noarch.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-markupsafe-0.11-4.puias6.x86_64.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-pygments-1.4-4.sdl6.1.noarch.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-docutils-0.8.1-3.sdl6.2.noarch.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-imaging-1.1.7-6.puias6.x86_64.rpm
-    curl -O http://springdale.math.ias.edu/data/puias/computational/6/x86_64/python27-sphinx-1.1.3-1.sdl6.1.noarch.rpm 
-    sudo yum install ./python27-markupsafe-0.11-4.puias6.x86_64.rpm \
-      ./python27-babel-0.9.6-2.sdl6.1.noarch.rpm \
-      ./python27-jinja2-2.7.2-2.sdl6.noarch.rpm \
-      ./python27-pygments-1.4-4.sdl6.1.noarch.rpm \
-      ./python27-docutils-0.8.1-3.sdl6.2.noarch.rpm \
-      ./python27-imaging-1.1.7-6.puias6.x86_64.rpm \
-      ./python27-sphinx-1.1.3-1.sdl6.1.noarch.rpm 
+
+    sudo yum update
+    sudo yum install python27-sphinx
 
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------

diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md
index 2de64b8f404aa5d17fbbcaed00cbcc4bd32d9863..7deea54de4608c0ad208276a448cc6795b24814f 100644 (file)
--- a/redhat/README.rpm_build.md
+++ b/redhat/README.rpm_build.md
@@ -29,7 +29,7 @@ Building your own FRRouting RPM
         cd frr
         ./bootstrap.sh
         ./configure --with-pkg-extra-version=-MyRPMVersion
-        make dist
+        make SPHINXBUILD=sphinx-build2.7 dist
             
     Note: configure parameters are not important for the RPM building - except the `with-pkg-extra-version` if you want to give the RPM a specific name to
     mark your own unoffical build