removed conflicts tag

This commit is contained in:
Jiri Skala 2011-06-08 13:43:57 +02:00
parent 0a907a0f30
commit a460f0e672

View File

@ -32,7 +32,7 @@
Summary: Routing daemon
Name: quagga
Version: 0.99.18
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Daemons
Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz
@ -75,7 +75,6 @@ Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
Provides: routingdaemon = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: bird gated mrt zebra
%description
Quagga is a free software that manages TCP/IP based routing
@ -360,6 +359,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Wed Jun 08 2011 Jiri Skala <jskala@redhat.com> - 0.99.18-4
- removed conflicts tag
* Thu Apr 28 2011 Jiri Skala <jskala@redhat.com> - 0.99.18-3
- fixes Requires /sbin/{chkconfig, install-info} (#226352 - Merge review)