[packages/madwifi-ng] - drop non-dist kernel support

baggins baggins at pld-linux.org
Tue Jan 27 20:20:38 CET 2015


commit 6282284eb51613fd3fb73c77b92cd3cc9ae6b821
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 27 20:19:32 2015 +0100

    - drop non-dist kernel support

 madwifi-ng.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index 24a8b5b..761bb98 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -4,15 +4,10 @@
 # - broken build without kernel
 #
 # Conditional build:
-%bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without kernel}
-%undefine	with_dist_kernel
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -78,7 +73,7 @@ Patch3:		%{pname}-ieee80211-skb-update.patch
 Patch4:		format-security.patch
 URL:		http://madwifi-project.org/
 BuildRequires:	rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
 Provides:	madwifi
 Obsoletes:	madwifi
 ExclusiveArch:	alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9 sparc64 xscale
@@ -114,11 +109,9 @@ Summary(pl.UTF-8):	Sterownik dla Linuksa do kart Atheros\
 Release:	%{prel}@%{_kernel_ver_str}\
 Group:		Base/Kernel\
 Requires(post,postun):	/sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):	%releq_kernel\
 Obsoletes:	kernel-smp-net-madwifi-ng\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-net-madwifi-ng\
 This is driver for Atheros card for Linux.\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/madwifi-ng.git/commitdiff/d6051d41a311127a29f765cc4a536564842e9305



More information about the pld-cvs-commit mailing list