redhat: Update spec file for new rst documentation

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2018-02-26 07:45:19 -08:00 committed by Quentin Young
parent 0f2ac0c5ba
commit 609dee9d83
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F

View File

@ -135,14 +135,14 @@ URL: http://www.frrouting.org
Requires(pre): /sbin/install-info Requires(pre): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
BuildRequires: gcc texi2html texinfo patch libcap-devel groff BuildRequires: gcc patch libcap-devel
BuildRequires: readline readline-devel ncurses ncurses-devel BuildRequires: readline readline-devel ncurses ncurses-devel
BuildRequires: json-c-devel bison >= 2.7 flex make BuildRequires: json-c-devel bison >= 2.7 flex make
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
#python27-devel is available from ius community repo for RedHat/CentOS 6 #python27-devel is available from ius community repo for RedHat/CentOS 6
BuildRequires: python27-devel BuildRequires: python27-devel python-sphinx10
%else %else
BuildRequires: python-devel >= 2.7 BuildRequires: python-devel >= 2.7 python-sphinx
%endif %endif
Requires: ncurses json-c initscripts Requires: ncurses json-c initscripts
%if %{with_pam} %if %{with_pam}
@ -169,7 +169,7 @@ protocol. It takes multi-server and multi-thread approach to resolve
the current complexity of the Internet. the current complexity of the Internet.
FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP
NHRP and EIGRP. NHRP, Babel and EIGRP.
FRRouting is a fork of Quagga. FRRouting is a fork of Quagga.
@ -302,11 +302,7 @@ developing OSPF-API and frr applications.
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
pushd doc pushd doc
if [ $(texi2html --version | cut -d. -f1) -lt 5 ]; then make frr.info
texi2html --number-sections frr.texi
else
texi2html --number-footnotes --number-sections frr.texi
fi
popd popd
%install %install
@ -506,7 +502,6 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc */*.sample* AUTHORS COPYING %doc */*.sample* AUTHORS COPYING
%doc doc/frr.html
%doc doc/mpls %doc doc/mpls
%doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES %doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES
%if 0%{?frr_user:1} %if 0%{?frr_user:1}
@ -602,7 +597,10 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Fri Oct 20 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version} * Tue Feb 20 2018 Martin Winter <mwinter@opensourcerouting.org> - %{version}
- Adapt to new documentation structure based on Sphinx
* Fri Oct 20 2017 Martin Winter <mwinter@opensourcerouting.org>
- Fix script location for watchfrr restart functions in daemon config - Fix script location for watchfrr restart functions in daemon config
- Fix postun script to restart frr during upgrade - Fix postun script to restart frr during upgrade