X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=wl.spec;h=a3221e26898f2c16a1105cdcf1ad92479e2b4ef8;hb=f989711a6868a7883210f8e972bf34cfc3ff898c;hp=9e16adcf17017050b71bc5385d97a77ea64dea3d;hpb=ed656948a789c5ce3e16a8b8734ea4a6346af4bc;p=packages%2Fwl.git

diff --git a/wl.spec b/wl.spec
index 9e16adc..a3221e2 100644
--- a/wl.spec
+++ b/wl.spec
@@ -1,22 +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
-
-# 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
-# with every kernel change.
-%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
-
 %if "%{_alt_kernel}" != "%{nil}"
 %if 0%{?build_kernels:1}
 %{error:alt_kernel and build_kernels are mutually exclusive}
@@ -34,26 +20,27 @@ exit 1
 %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	4
+%define		rel	3
 %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}
-Version:	6.30.223.141
+Version:	6.30.223.248
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	other
 Group:		Base/Kernel
 Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-%{file_ver}.tar.gz
-# Source0-md5:	f4809d9149e8e60ef95021ae93a4bf21
+# Source0-md5:	e048154b3f4c7ad6bee36cab5b37486d
 Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-%{file_ver}.tar.gz
-# Source1-md5:	039f33d2a3ff2890e42717092d1eb0c4
+# Source1-md5:	0237917f75d121589ec16a44eac5f5b0
 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}}
+%{?with_kernel:%{expand:%kbrs}}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,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\
@@ -131,7 +116,8 @@ EOF\
 %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