[packages/wl] - drop non-dist kernl support
baggins
baggins at pld-linux.org
Tue Jan 27 19:56:47 CET 2015
commit f989711a6868a7883210f8e972bf34cfc3ff898c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 27 19:54:47 2015 +0100
- drop non-dist kernl support
wl.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/wl.spec b/wl.spec
index 5d57ac6..a3221e2 100644
--- a/wl.spec
+++ b/wl.spec
@@ -1,13 +1,8 @@
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_with verbose # verbose build (V=1)
%bcond_with dkms # build dkms package
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
%if "%{_alt_kernel}" != "%{nil}"
%if 0%{?build_kernels:1}
%{error:alt_kernel and build_kernels are mutually exclusive}
@@ -45,7 +40,7 @@ Patch0: linux-3.17.patch
Patch1: gcc-4.9.patch
URL: http://www.broadcom.com/support/802.11/linux_sta.php
BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,10 +72,8 @@ Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-net-wl\
These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/747711c2b9fe1437fd46f23a57fa0d0bdf8943f7
More information about the pld-cvs-commit
mailing list