diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-04-20 03:12:10 +0200 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-04-20 03:12:10 +0200 |
| commit | b387c334d4a2ea66a1088771784d621190681930 (patch) | |
| tree | 25e38afe6c90c65611d66b1c4a183d3c8f08ad01 /redhat | |
| parent | redhat: Update documentation for RPM build and usage (diff) | |
| download | frr-b387c334d4a2ea66a1088771784d621190681930.tar.xz frr-b387c334d4a2ea66a1088771784d621190681930.zip | |
redhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons
- add make & gcc
- remove autoconf and automake (not needed to build from src.rpm)
- fix texi2html version detection for case when no texi2html is installed (broke yum-builddep)
- fix duplicate listing of /etc/frr/daemons
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/frr.spec.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 6f29f0f98..c78fc54b7 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -8,7 +8,7 @@ # rpms again and again on the same day, so the newer rpms can be installed. # bumping the number each time. -####################### FRRouting (FRR) configure options ######################### +#################### FRRouting (FRR) configure options ##################### # with-feature options %{!?with_tcp_zebra: %global with_tcp_zebra 0 } %{!?with_pam: %global with_pam 0 } @@ -45,7 +45,7 @@ #### Check version of texi2html # Old versions don't support "--number-footnotes" option. -%{expand: %%global texi2htmlversion %(/usr/bin/texi2html --version | cut -d. -f1)} +%{expand: %%global texi2htmlversion %(if [[ -f /usr/bin/texi2html ]]; then /usr/bin/texi2html --version | cut -d. -f1; else echo 0; fi)} #### Check for systemd or init.d (upstart) # Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7) @@ -120,9 +120,9 @@ Requires: ncurses json-c Requires(pre): /sbin/install-info Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: texi2html texinfo autoconf automake patch libcap-devel groff +BuildRequires: gcc texi2html texinfo patch libcap-devel groff BuildRequires: readline readline-devel ncurses ncurses-devel -BuildRequires: json-c-devel bison >= 2.7 flex +BuildRequires: json-c-devel bison >= 2.7 flex make Requires: ncurses initscripts %if %{with_pam} BuildRequires: pam-devel @@ -502,8 +502,8 @@ rm -rf %{buildroot} %attr(755,root,root) %{_libdir}/lib*.so.0.* %endif %{_bindir}/* -%config(noreplace) /etc/frr/[!v]* -%attr(750,%frr_user,%frr_user) /etc/frr/daemons +%config(noreplace) /etc/frr/[!v]*.conf* +%config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons %if "%{initsystem}" == "systemd" %config %{_unitdir}/frr.service %{_sbindir}/frr |