]> git.pld-linux.org Git - packages/wl.git/commitdiff
- drop non-dist kernl support
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 27 Jan 2015 18:54:47 +0000 (19:54 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Tue, 27 Jan 2015 18:54:47 +0000 (19:54 +0100)
wl.spec

diff --git a/wl.spec b/wl.spec
index 5d57ac68968640242e2a2cb728b96f8dc2364c49..a3221e26898f2c16a1105cdcf1ad92479e2b4ef8 100644 (file)
--- 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\
This page took 0.073306 seconds and 4 git commands to generate.