summaryrefslogtreecommitdiffstats
path: root/redhat/frr.spec.in
diff options
context:
space:
mode:
authorBrian Rak <brianrak@gameservers.com>2017-08-07 20:37:21 +0200
committerBrian Rak <brianrak@gameservers.com>2017-08-07 20:37:21 +0200
commit5d82c57b76b8718ba586728957301254905993ac (patch)
treed9c9a17a65163e7a99ea8df90ddbd0b2c860b062 /redhat/frr.spec.in
parentMerge pull request #910 from opensourcerouting/isis-perf2 (diff)
downloadfrr-5d82c57b76b8718ba586728957301254905993ac.tar.xz
frr-5d82c57b76b8718ba586728957301254905993ac.zip
rhel: Don't obsolete bird
The FRR RPM was obsoleting BIRD, which meant that as soon as you added a FRR RPM to a repository, you could no longer install BIRD. This patch switches it over to Conflicts instead, which should be much nicer behavior
Diffstat (limited to '')
-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 674ccb2d6..b23249e04 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