From 33352afd41ed5a78d2bd1b312f4a5e36297f21ad Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Jul 21 2019 13:21:06 +0000 Subject: Adding conflict with frr --- diff --git a/quagga.spec b/quagga.spec index f2d29c7..dd544ae 100644 --- a/quagga.spec +++ b/quagga.spec @@ -7,7 +7,7 @@ Name: quagga Version: 1.2.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Routing daemon License: GPLv2+ URL: http://www.quagga.net @@ -28,6 +28,7 @@ Requires(preun): systemd Requires(postun): systemd Provides: routingdaemon = %{version}-%{release} Obsoletes: quagga-sysvinit +Conflicts: frr Patch0001: 0001-service-file-braces.patch @@ -212,6 +213,9 @@ fi %{_includedir}/quagga/ospfd/*.h %changelog +* Sun Jul 21 2019 Michal Ruprich - 1.2.4-10 +- Adding conflict with frr + * Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko - 1.2.4-9 - Rebuild for RPM 4.15