- changed Requires: right-kernel to Conflicts: wrong-kernel

- release 3, STBR

Changed files:
    bcm5700.spec -> 1.8

diff --git a/bcm5700.spec b/bcm5700.spec
index 97ce78a3447c0661033cd0a8e7222ba6cd1fb334..08c88b4d4d1415c53a041d1f93d2bb191636d3e9 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -5,7 +5,7 @@
 %define                _kernel_ver     %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
 %define                _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
 %define                _orig_name      bcm5700
-%define                _rel 2
+%define                _rel 3
 
 Summary:       Linux driver for the 3Com Gigabit Server BCM5700 (3C996) Network Interface Cards
 Summary(pl):   Sterownik dla Linuxa dla kart sieciowych gigabit ethernet BCM5700 (3C996)
@@ -18,8 +18,7 @@ Source0:      http://support.3com.com/infodeli/tools/nic/linux/%{_orig_name}-%{versio
 %{!?_without_dist_kernel:BuildRequires:         kernel-headers }
 Obsoletes:     kernel-smp-net-%{_orig_name}
 Prereq:                /sbin/depmod
-%{!?_without_dist_kernel:Conflicts:    kernel < %{_kernel_ver}, kernel > %{_kernel_ver}}
-%{!?_without_dist_kernel:Conflicts:    kernel-smp}
+%{!?_without_dist_kernel:Requires:     kernel-up = %{_kernel_ver}}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,8 +33,7 @@ Sterownik dla Linuxa dla kart sieciowych gigabit ethernet BCM5700
 Summary:       Linux SMP driver for the 3Com Gigabit Server BCM5700 (3C996) Network Interface Cards.
 Summary(pl):   Sterownik dla Linuxa SMP dla kart sieciowych gigabit ethernet BCM5700 (3C996).
 Release:       %{_rel}@%{_kernel_ver_str}
-%{!?_without_dist_kernel:Conflicts:     kernel < %{_kernel_ver}, kernel > %{_kernel_ver}}
-%{!?_without_dist_kernel:Conflicts:     kernel-up}
+%{!?_without_dist_kernel:Requires:     kernel-smp = %{_kernel_ver}}
 Obsoletes:     kernel-net-%{_orig_name}
 Group:         Base/Kernel