diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-03-02 19:00:46 +0100 |
|---|---|---|
| committer | Renato Westphal <renatowestphal@gmail.com> | 2019-03-29 15:32:21 +0100 |
| commit | 8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch) | |
| tree | 0a460d2da46a5b910535529c92e8db2fa5ff2a74 /redhat/frr.spec.in | |
| parent | yang: sync the IETF module translator with the latest frr-ripd changes (diff) | |
| parent | Merge pull request #3894 from donaldsharp/install_replace (diff) | |
| download | frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.tar.xz frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.zip | |
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'redhat/frr.spec.in')
| -rw-r--r-- | redhat/frr.spec.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 7a6344aa4..78b1f7c87 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -162,7 +162,7 @@ BuildRequires: make BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: texinfo -BuildRequires: libyang >= 0.16.7 +BuildRequires: libyang-devel >= 0.16.74 %if 0%{?rhel} && 0%{?rhel} < 7 #python27-devel is available from ius community repo for RedHat/CentOS 6 BuildRequires: python27-devel @@ -171,6 +171,7 @@ BuildRequires: python27-sphinx BuildRequires: python-devel >= 2.7 BuildRequires: python-sphinx %endif +Requires: initscripts %if %{with_pam} BuildRequires: pam-devel %endif @@ -188,7 +189,6 @@ Requires(post): chkconfig Requires(preun): chkconfig # Initscripts > 5.60 is required for IPv6 support Requires(pre): initscripts >= 5.60 -Requires: initscripts %endif Provides: routingdaemon = %{version}-%{release} Obsoletes: gated mrt zebra frr-sysvinit @@ -624,7 +624,6 @@ fi %{_libdir}/frr/modules/bgpd_rpki.so %endif %{_libdir}/frr/modules/zebra_irdp.so -%{_libdir}/frr/libyang_plugins/frr_user_types.so %{_bindir}/* %config(noreplace) %{configdir}/[!v]*.conf* %config(noreplace) %attr(750,%{frr_user},%{frr_user}) %{configdir}/daemons |