- use new macros (ver-rel)

- removed smp/up obsoletes
- rel. 5.

Changed files:
    bcm5700.spec -> 1.12

diff --git a/bcm5700.spec b/bcm5700.spec
index 4a97b863da03ff2b47f4676a91dbfb6555d6ff7d..e50ebed8f39b4a432ebb25d3ce394711ea1fe464 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -2,10 +2,8 @@
 # conditional build
 # _without_dist_kernel          without distribution kernel
 
-%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 4
+%define                _rel 5
 
 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)
@@ -17,7 +15,6 @@ Group:                Base/Kernel
 Source0:       http://support.3com.com/infodeli/tools/nic/linux/%{_orig_name}-%{version}.tar.gz
 %{!?_without_dist_kernel:BuildRequires:         kernel-headers }
 BuildRequires: %{kgcc_package}
-Obsoletes:     kernel-smp-net-%{_orig_name}
 Prereq:                /sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_up}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,7 +34,6 @@ Release:      %{_rel}@%{_kernel_ver_str}
 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
@@ -59,11 +55,11 @@ mv -f %{_orig_name}.o ../%{_orig_name}-smp.o
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/net
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/net
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
 install -d $RPM_BUILD_ROOT%{_mandir}/man4
-install %{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/net/%{_orig_name}.o
-install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/net/%{_orig_name}.o
+install %{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o
+install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.o
 install src/%{_orig_name}.4.gz $RPM_BUILD_ROOT%{_mandir}/man4
 
 gzip -9nf RELEASE.TXT
@@ -86,11 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *.gz
-/lib/modules/%{_kernel_ver}/net/*
+/lib/modules/%{_kernel_ver}/misc/*
 %{_mandir}/man?/*
 
 %files -n kernel-smp-net-%{_orig_name}
 %defattr(644,root,root,755)
 %doc *.gz 
-/lib/modules/%{_kernel_ver}smp/net/*
+/lib/modules/%{_kernel_ver}smp/misc/*
 %{_mandir}/man?/*