SPECS: bcm4400.spec - updated to 1.00g

[glen]

Author: glen                         Date: Sat Feb  9 10:23:20 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.00g

---- Files affected:
SPECS:
   bcm4400.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/bcm4400.spec
diff -u SPECS/bcm4400.spec:1.29 SPECS/bcm4400.spec:1.30
--- SPECS/bcm4400.spec:1.29	Mon Sep 10 01:43:01 2007
+++ SPECS/bcm4400.spec	Sat Feb  9 11:23:15 2008
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO
+# - rename to b44?
+# - drop as it's upstream now? only difference with upstream is that this
+#   source contains lots of backward kernel compatible ifdefs
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
@@ -6,19 +10,19 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	2
+%define		_rel	0.1
 Summary:	Broadcom BCM4400 series driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Broadcom BCM4400
 Name:		bcm4400
-Version:	3.0.14
+Version:	1.00g
 Release:	%{_rel}
+Epoch:		1
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.broadcom.com/docs/driver_download/440x/linux-%{version}.zip
-# Source0-md5:	3539dc7a212a8f0dbdfeef40c7c4e027
+# Source0-md5:	9572a57303eeab1397de54f2090dc7ce
 Source1:	%{name}-Makefile
-Patch0:		%{name}-fix-unknown_symbol.patch
-Patch1:		%{name}-utsrelease.patch
+Patch0:		b44-pci_module_init.patch
 URL:		http://www.broadcom.com/drivers/downloaddrivers.php
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -60,25 +64,25 @@
 
 %prep
 %setup -q -c
-%{__tar} zxf %{name}-%{version}.tar.gz
-%patch0 -p1
-%patch1 -p1
+%{__tar} zxf linux/b44-%{version}.tar.gz
+%patch0 -p0
+mv b44-%{version}/Makefile{,.orig}
+ln -s %{SOURCE1} b44-%{version}/Makefile
+%{__sed} -i -e 's,\r$,,' linux/README.TXT
 
 %build
-cd %{name}-%{version}/src
-
 %if %{with kernel}
-install %{SOURCE1} Makefile
+cd b44-%{version}
 %build_kernel_modules -m bcm4400
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}-%{version}/src
+cd b44-%{version}
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_mandir}/man4
-install bcm4400.4 $RPM_BUILD_ROOT%{_mandir}/man4
+cp -a b44.4 $RPM_BUILD_ROOT%{_mandir}/man4
 %endif
 
 %if %{with kernel}
@@ -97,8 +101,8 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README.TXT %{name}-%{version}/RELEASE.TXT
-%{_mandir}/man4/bcm4400.*
+%doc linux/README.TXT
+%{_mandir}/man4/b44.*
 %endif
 
 %if %{with kernel}
@@ -113,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2008-02-09 10:23:15  glen
+- updated to 1.00g
+
 Revision 1.29  2007-09-09 23:43:01  zbyniu
 - removed up, smp bconds, smp subpackage; patch utsrelease added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bcm4400.spec?r1=1.29&r2=1.30&f=u