10:30 p.m.
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9545
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.60.48.36-license.patch
Removed Files:
broadcom-wl-5.10.91.9.3-license.patch
broadcom-wl-5.10.91.9.3-linux-2.6.32.patch
Log Message:
* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-1
- Updated version to 5.60.48.36
broadcom-wl-5.60.48.36-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.60.48.36-license.patch ---
diff -Naur --recursive hybrid-portsrc-x86_32-v5.60.48.36.orig/src/wl/sys/wl_linux.c
hybrid-portsrc-x86_32-v5.60.48.36/src/wl/sys/wl_linux.c
--- hybrid-portsrc-x86_32-v5.60.48.36.orig/src/wl/sys/wl_linux.c 2010-02-05
20:59:15.000000000 -0500
+++ hybrid-portsrc-x86_32-v5.60.48.36/src/wl/sys/wl_linux.c 2010-02-22 16:14:45.982808162
-0500
@@ -151,6 +151,8 @@
static void wl_force_kill(wl_task_t *task);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 9 Feb 2010 22:38:50 -0000 1.8
+++ .cvsignore 22 Feb 2010 22:30:25 -0000 1.9
@@ -1,2 +1,3 @@
-hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
-hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz
+hybrid-portsrc-x86_32-v5.60.48.36.tar.gz
+hybrid-portsrc-x86_64-v5.60.48.36.tar.gz
+broadcom-wl-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 9 Feb 2010 22:38:50 -0000 1.8
+++ sources 22 Feb 2010 22:30:25 -0000 1.9
@@ -1,2 +1,3 @@
-15890e1f9afe844adf2e251d390e28ac hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz
-ed255d2c98690ef76757d95b2d9e6b32 hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz
+0466d863405e1ab99d5e288fe886e852 hybrid-portsrc-x86_32-v5.60.48.36.tar.gz
+a78095ddcc30a191f64dccbc31b84de8 hybrid-portsrc-x86_64-v5.60.48.36.tar.gz
+5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/wl-kmod.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- wl-kmod.spec 11 Feb 2010 19:49:08 -0000 1.62
+++ wl-kmod.spec 22 Feb 2010 22:30:25 -0000 1.63
@@ -3,20 +3,19 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: wl-kmod
-Version: 5.10.91.9.3
-Release: 1%{?dist}.1
+Version: 5.60.48.36
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.10.91.9.3...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.10.91.9.3...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.60.48.36....
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.60.48.36....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.91.9.3-license.patch
-Patch1: broadcom-wl-5.10.91.9.3-linux-2.6.32.patch
+Patch0: broadcom-wl-5.60.48.36-license.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -54,7 +53,6 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p1 -b .kernelfix
popd
for kernel_version in %{?kernel_versions} ; do
@@ -84,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-1
+- Updated version to 5.60.48.36
+
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
5.10.91.9.3-1.1
- rebuild for new kernel
--- broadcom-wl-5.10.91.9.3-license.patch DELETED ---
--- broadcom-wl-5.10.91.9.3-linux-2.6.32.patch DELETED ---