From: Brian Rak <brianrak@gameservers.com>
Date: Mon, 7 Aug 2017 18:37:21 +0000 (-0400)
Subject: rhel: Don't obsolete bird
X-Git-Tag: frr-4.0-dev~444^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5d82c57b76b8718ba586728957301254905993ac;p=mirror%2Ffrr.git

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
---

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