From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 27 Jan 2015 18:54:47 +0000 (+0100)
Subject: - drop non-dist kernl support
X-Git-Tag: auto/th/wl-6.30.223.248-4~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fwl.git;a=commitdiff_plain;h=f989711a6868a7883210f8e972bf34cfc3ff898c

- drop non-dist kernl support
---

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\