X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-net-wl.spec;h=5748259fb6317111d75f35a86621c6ec44f90c7c;hb=4ea1dfb5a92873ff59ba20bdb7f16f896a8cec13;hp=36d5491a64c4216205f51618a964097fa848843c;hpb=7a355ea9750e1f2254f8d605e0d882c789587d3a;p=packages%2Fwl.git

diff --git a/kernel-net-wl.spec b/kernel-net-wl.spec
index 36d5491..5748259 100644
--- a/kernel-net-wl.spec
+++ b/kernel-net-wl.spec
@@ -2,13 +2,13 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		rel	5
+%define		rel	15
 %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:		kernel%{_alt_kernel}-net-wl
 Version:	5.100.82.112
-Release:	%{rel}
+Release:	%{rel}@%{_kernel_ver_str}
 License:	other
 Group:		Base/Kernel
 Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v%{file_ver}.tar.gz
@@ -19,9 +19,15 @@ Source2:	http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5:	6fd54aac59a53559d01520f35500693b
 Patch1:		kernel-net-wl-linux-3.2.patch
 Patch2:		kernel-net-wl-linux-3.4.patch
+Patch3:		kernel-net-wl-linux-3.10.patch
 URL:		http://www.broadcom.com/support/802.11/linux_sta.php
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
+Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
+%endif
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,24 +39,6 @@ device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
 BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
 BCM43228-based hardware.
 
-%package -n kernel%{_alt_kernel}-net-wl
-Summary:	Linux driver for wl
-Summary(pl.UTF-8):	Sterownik dla Linuksa do wl
-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
-This is driver for wl for Linux. These packages contain Broadcom's
-IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's
-BCM4311-, BCM4312-, BCM4321-, and BCM4322-based hardware.
-
-This package contains Linux module.
-
 %prep
 %ifarch %{x8664}
 %define src 1
@@ -60,6 +48,7 @@ This package contains Linux module.
 %setup -c -T -q -n %{pname}-%{version} -b%src
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 cat > Makefile << EOF
 obj-m	+= wl.o
@@ -85,19 +74,19 @@ install %{SOURCE2} .
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n kernel%{_alt_kernel}-net-wl
+%post
 %depmod %{_kernel_ver}
 
-%posttrans -n kernel%{_alt_kernel}-net-wl
+%posttrans
 %banner -e kernel%{_alt_kernel}-net-wl <<EOF
 WARNING! This kernel module is not GPL licensed.
 Before using it be sure to accept license: %{_docdir}/kernel%{_alt_kernel}-net-wl-%{version}/LICENSE.txt*
 EOF
 
-%postun	-n kernel%{_alt_kernel}-net-wl
+%postun
 %depmod %{_kernel_ver}
 
-%files -n kernel%{_alt_kernel}-net-wl
+%files
 %defattr(644,root,root,755)
 %doc lib/LICENSE.txt README.txt
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*