X-Git-Url: http://git.pld-linux.org/?p=packages%2Fwl.git;a=blobdiff_plain;f=wl.spec;h=cfe637bfb91b5945378a7f1ca71ec805cf378f6b;hp=35282f384059de8130f98b5e879436dac4578dd2;hb=42a6a3d;hpb=e9e4c66cd61c0cff4ecf516b6f3c1711373cb9b2

diff --git a/wl.spec b/wl.spec
index 35282f3..cfe637b 100644
--- a/wl.spec
+++ b/wl.spec
@@ -1,35 +1,26 @@
 # 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
+%bcond_without	userspace	# don't build userspace programs
+%bcond_without	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}
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
 exit 1
 %endif
-%global		_build_kernels		%{alt_kernel}
-%else
-%global		_build_kernels		%{?build_kernels:,%{?build_kernels}}
+
+%if %{without userspace}
+%undefine	with_dkms
 %endif
 
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		kbrs	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%define		kpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define		bkpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
-%define		rel	0.1
+%define		rel	8
 %define		pname	wl
 %define		file_ver	%(echo %{version} | tr . _)
 Summary:	Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
-Name:		%{pname}%{_alt_kernel}
+Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:	6.30.223.248
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	other
@@ -41,11 +32,12 @@ Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-%{fi
 Source2:	http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5:	8a6e8708a5e00ab6d841cde51d70eb1b
 Source3:	dkms.conf
-Patch0:		broadcom-sta-6.30.223.141-kernel-3.10.patch
+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}}
-ExclusiveArch:	%{ix86} %{x8664}
+BuildRequires:	rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+ExclusiveArch:	%{ix86} %{x8664} x32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,10 +68,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\
@@ -113,16 +103,17 @@ EOF\
 %install_kernel_modules -D installed -m wl -d kernel/drivers/net/wireless\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %define src 1
 %else
 %define src 0
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%{src}
-#%patch0 -p2
+%patch0 -p1
+%patch1 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -145,7 +136,7 @@ EXTRA_LDFLAGS	:= $(KBUILD_EXTMOD)/lib/wlc_hybrid.o_shipped
 EOF
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT