SPECS (AC-branch): bcm5700.spec - use vermagic for kernel deps

glen glen at pld-linux.org
Fri Feb 15 15:28:48 CET 2008


Author: glen                         Date: Fri Feb 15 14:28:48 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use vermagic for kernel deps

---- Files affected:
SPECS:
   bcm5700.spec (1.55.2.4 -> 1.55.2.5) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.55.2.4 SPECS/bcm5700.spec:1.55.2.5
--- SPECS/bcm5700.spec:1.55.2.4	Fri Feb 15 15:26:22 2008
+++ SPECS/bcm5700.spec	Fri Feb 15 15:28:43 2008
@@ -8,7 +8,7 @@
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
-%if !%{with kernel}
+%if %{without kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -21,7 +21,7 @@
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart sieciowych Broadcom NetXtreme BCM57xx
 Name:		bcm5700
 Version:	8.3.14
-Release:	%{_rel}
+Release:	2
 License:	GPL v2
 Group:		Base/Kernel
 # extracted from http://www.broadcom.com/docs/driver_download/570x/linux-8.3.14.zip
@@ -50,13 +50,9 @@
 %package -n kernel-net-bcm5700
 Summary:	Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
-Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
-%endif
 
 %description -n kernel-net-bcm5700
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface
@@ -72,13 +68,9 @@
 %package -n kernel-smp-net-bcm5700
 Summary:	Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
-Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
 
 %description -n kernel-smp-net-bcm5700
 Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network
@@ -152,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55.2.5  2008-02-15 14:28:43  glen
+- use vermagic for kernel deps
+
 Revision 1.55.2.4  2008-02-15 14:26:22  glen
 - merge with HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bcm5700.spec?r1=1.55.2.4&r2=1.55.2.5&f=u



More information about the pld-cvs-commit mailing list