- s/Conflicts/Obsoletes ifstat

- rel 2

Changed files:
    iproute2.spec -> 1.123

diff --git a/iproute2.spec b/iproute2.spec
index 454a83b2910b2aef4660d73e34ecb0bd803f661e..f907f3a8b35c3d989776ca595dcf65565541d005 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -16,7 +16,7 @@ Name:         iproute2
 %define        sdate   040702
 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8
 Version:       2.6.8
-Release:       1
+Release:       2
 License:       GPL
 Vendor:                Stephen Hemminger <shemminger@osdl.org>
 Group:         Networking/Admin
@@ -42,7 +42,7 @@ BuildRequires:        tetex-metafont
 BuildRequires: tetex-tex-babel
 %endif
 Obsoletes:     iproute
-Conflicts:     ifstat
+Obsoletes:     ifstat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin