summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2017-08-08 04:16:08 +0200
committerGitHub <noreply@github.com>2017-08-08 04:16:08 +0200
commite8a53dbc5278ffbf489c2be8cfcc1c973c0b0014 (patch)
treec6168716e0e117e6be9d9a8f9266cb532036f5c3
parent9074ba8423657e8112cbb9fd0c4eb58325f37891 (diff)
parent5d82c57b76b8718ba586728957301254905993ac (diff)
Merge pull request #923 from devicenull/master
rhel: Don't obsolete bird
-rw-r--r--redhat/frr.spec.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 674ccb2d6f..b23249e04e 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -168,7 +168,8 @@ Requires(pre): initscripts >= 5.60
%endif
Provides: routingdaemon = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: bird gated mrt zebra frr-sysvinit
+Obsoletes: gated mrt zebra frr-sysvinit
+Conflicts: bird
%description
FRRouting is a free software that manages TCP/IP based routing