- use requires_releq_kernel_{up,smp} macros, BR: egcs, release 4

Changed files:
    bcm5700.spec -> 1.9

diff --git a/bcm5700.spec b/bcm5700.spec
index 08c88b4d4d1415c53a041d1f93d2bb191636d3e9..6b9f9a30e10d7311ea5343225e8453c743853eca 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -5,10 +5,10 @@
 %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 3
+%define                _rel 4
 
-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)
+Summary:       Linux driver for the 3Com Gigabit Server BCM5700 (3c996) Network Interface Cards
+Summary(pl):   Sterownik dla Linuksa do kart sieciowych gigabit ethernet BCM5700 (3c996)
 Name:          kernel-net-%{_orig_name}
 Version:       2.0.28
 Release:       %{_rel}@%{_kernel_ver_str}
@@ -16,44 +16,46 @@ License:    GPL
 Group:         Base/Kernel
 Source0:       http://support.3com.com/infodeli/tools/nic/linux/%{_orig_name}-%{version}.tar.gz
 %{!?_without_dist_kernel:BuildRequires:         kernel-headers }
+BuildRequires: egcs
 Obsoletes:     kernel-smp-net-%{_orig_name}
 Prereq:                /sbin/depmod
-%{!?_without_dist_kernel:Requires:     kernel-up = %{_kernel_ver}}
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Linux driver for the 3Com Gigabit Server BCM5700 (3C996) Network
+Linux driver for the 3Com Gigabit Server BCM5700 (3c996) Network
 Interface Cards.
 
 %description -l pl
-Sterownik dla Linuxa dla kart sieciowych gigabit ethernet BCM5700
-(3C996). Obs³uguje karty o symbolach 3C996B-T i 3C996-SX.
+Sterownik dla Linuksa do kart sieciowych gigabit ethernet BCM5700
+(3c996). Obs³uguje karty o symbolach 3c996B-T i 3c996-SX.
 
 %package -n kernel-smp-net-%{_orig_name}
-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).
+Summary:       Linux SMP driver for the 3Com Gigabit Server BCM5700 (3c996) Network Interface Cards
+Summary(pl):   Sterownik dla Linuksa SMP do kart sieciowych gigabit ethernet BCM5700 (3c996)
 Release:       %{_rel}@%{_kernel_ver_str}
-%{!?_without_dist_kernel:Requires:     kernel-smp = %{_kernel_ver}}
-Obsoletes:     kernel-net-%{_orig_name}
 Group:         Base/Kernel
+Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+Obsoletes:     kernel-net-%{_orig_name}
 
 %description -n kernel-smp-net-%{_orig_name}
-Linux SMP driver for the 3Com Gigabit Server BCM5700 (3C996) Network
+Linux SMP driver for the 3Com Gigabit Server BCM5700 (3c996) Network
 Interface Cards.
 
 %description -n kernel-smp-net-%{_orig_name} -l pl
-Sterownik dla Linuxa dla kart sieciowych gigabit ethernet BCM5700
-(3C996). Obs³uguje karty o symbolach 3C996B-T i 3C996-SX.
+Sterownik dla Linuksa do kart sieciowych gigabit ethernet BCM5700
+(3c996). Obs³uguje karty o symbolach 3c996B-T i 3c996-SX.
 
 %prep
 %setup -q -n %{_orig_name}-%{version} -c
 
 %build
 cd src
-%__make CC="kgcc %{rpmcflags} -Wall -I%{_kernelsrcdir}/include -D__SMP__ -DCONFIG_X86_LOCAL_APIC"
-mv %{_orig_name}.o ../%{_orig_name}-smp.o
-%__make clean
-%__make CC="kgcc %{rpmcflags} -Wall -I%{_kernelsrcdir}/include"
+%{__make} CC="kgcc %{rpmcflags} -Wall -I%{_kernelsrcdir}/include -D__SMP__ -DCONFIG_X86_LOCAL_APIC"
+mv -f %{_orig_name}.o ../%{_orig_name}-smp.o
+%{__make} clean
+%{__make} CC="kgcc %{rpmcflags} -Wall -I%{_kernelsrcdir}/include"
 
 %install
 rm -rf $RPM_BUILD_ROOT