From: Martin Winter <mwinter@opensourcerouting.org>
Date: Thu, 1 Mar 2018 21:28:57 +0000 (-0800)
Subject: redhat: Update CentOS6 to use python27-sphinx package
X-Git-Tag: frr-5.0-dev~165^2~15
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ccd40deecef225dd973719a1101f2519641d7331;p=mirror%2Ffrr.git

redhat: Update CentOS6 to use python27-sphinx package

sphinx > 1.1 is needed which is provided by the non-standard
python27-sphinx for CentOS 6 / RedHat 6

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

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 9c7848499a..310d7ab939 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -37,6 +37,13 @@
 
 # defines for configure
 %define     _localstatedir  /var/run/frr
+
+# define for sphinx-build binary
+%if 0%{?rhel} && 0%{?rhel} < 7
+%define     sphinx sphinx-build2.7
+%else
+%define     sphinx sphinx-build
+%endif
 ############################################################################
 
 #### Version String tweak
@@ -140,7 +147,7 @@ BuildRequires:  readline readline-devel ncurses ncurses-devel
 BuildRequires:  json-c-devel bison >= 2.7 flex make
 %if 0%{?rhel} && 0%{?rhel} < 7
 #python27-devel is available from ius community repo for RedHat/CentOS 6
-BuildRequires:  python27-devel python-sphinx10
+BuildRequires:  python27-devel python27-sphinx
 %else
 BuildRequires:  python-devel >= 2.7 python-sphinx
 %endif
@@ -299,16 +306,16 @@ developing OSPF-API and frr applications.
 %endif
     --enable-poll=yes
 
-make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
+make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" SPHINXBUILD=%{sphinx}
 
 pushd doc
-make frr.info
+make SPHINXBUILD=%{sphinx} frr.info
 popd
 
 %install
 mkdir -p %{buildroot}/etc/{frr,sysconfig,logrotate.d,pam.d,default} \
          %{buildroot}/var/log/frr %{buildroot}%{_infodir}
-make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install
+make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" SPHINXBUILD=%{sphinx} install
 
 # Remove this file, as it is uninstalled and causes errors when building on RH9
 rm -rf %{buildroot}/usr/share/info/dir