SPECS: r1000.spec - support for current 2.6 kernels

[glen]

Author: glen                         Date: Wed Dec 12 14:57:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- support for current 2.6 kernels

---- Files affected:
SPECS:
   r1000.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/r1000.spec
diff -u SPECS/r1000.spec:1.12 SPECS/r1000.spec:1.13
--- SPECS/r1000.spec:1.12	Thu Nov 29 17:22:40 2007
+++ SPECS/r1000.spec	Wed Dec 12 15:57:26 2007
@@ -1,11 +1,9 @@
 # $Revision$, $Date$
-# TODO:
-# - check patch0 MODULE_PARM (...) -> module_param (...)
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	1
+%define		_rel	2
 Summary:	RTL8111B/RTL8168B/RTL8111/RTL8168 driver for Linux
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart RTL8111B/RTL8168B/RTL8111/RTL8168
 Name:		r1000
@@ -13,12 +11,13 @@
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	ftp://202.65.194.211/cn/nic/r1000_v%{version}.tgz
+Source0:	ftp://202.65.194.211/cn/nic/%{name}_v%{version}.tgz
 # Source0-md5:	4120f50c55b38b67e5dc741f86a1923a
-# Patch0:		%{name}-module_parm.patch
+Patch0:		%{name}-pci_module_init.patch
 URL:		http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PNid=5&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#RTL8111B/RTL8168B/RTL8111/RTL8168
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %package -n kernel%{_alt_kernel}-net-r1000
@@ -34,24 +33,25 @@
 Provides:	kernel(r1000)
 
 %description -n kernel%{_alt_kernel}-net-r1000
-This package contains the Linux driver for the Realtek
-family of RTL8111B/RTL8168B/RTL8111/RTL8168 Ethernet network adapters.
+This package contains the Linux driver for the Realtek family of
+RTL8111B/RTL8168B/RTL8111/RTL8168 Ethernet network adapters.
 
 %description -n kernel%{_alt_kernel}-net-r1000 -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
-Realtek RTL8111B/RTL8168B/RTL8111/RTL8168.
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych Realtek
+RTL8111B/RTL8168B/RTL8111/RTL8168.
 
 %description
-This package contains the Linux driver for the Realtek
-family of RTL8111B/RTL8168B/RTL8111/RTL8168 Ethernet network adapters.
+This package contains the Linux driver for the Realtek family of
+RTL8111B/RTL8168B/RTL8111/RTL8168 Ethernet network adapters.
 
 %description -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
-Realtek RTL8111B/RTL8168B/RTL8111/RTL8168.
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych Realtek
+RTL8111B/RTL8168B/RTL8111/RTL8168.
 
 %prep
-%setup -q -n r1000_v%{version}
-#%%patch0 -p1
+%setup -q -n %{name}_v%{version}
+%{__sed} -i -e 's,\r$,,' src/*.c
+%patch0 -p1
 
 %build
 %build_kernel_modules -m r1000 -C src
@@ -80,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007-12-12 14:57:26  glen
+- support for current 2.6 kernels
+
 Revision 1.12  2007-11-29 16:22:40  glen
 - spec renamed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/r1000.spec?r1=1.12&r2=1.13&f=u