SPECS: r1000.spec - up to 1.07; patch for new kernels

zbyniu zbyniu at pld-linux.org
Mon Mar 3 02:06:11 CET 2008


Author: zbyniu                       Date: Mon Mar  3 01:06:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.07; patch for new kernels

---- Files affected:
SPECS:
   r1000.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/r1000.spec
diff -u SPECS/r1000.spec:1.17 SPECS/r1000.spec:1.18
--- SPECS/r1000.spec:1.17	Mon Feb 11 12:32:54 2008
+++ SPECS/r1000.spec	Mon Mar  3 02:06:05 2008
@@ -4,17 +4,18 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		rel	5
+%define		rel	1
 Summary:	RTL8111B/RTL8168B/RTL8111/RTL8168 driver for Linux
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart RTL8111B/RTL8168B/RTL8111/RTL8168
 Name:		r1000
-Version:	1.05
+Version:	1.07
 Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://202.65.194.211/cn/nic/%{name}_v%{version}.tgz
-# Source0-md5:	4120f50c55b38b67e5dc741f86a1923a
+# Source0-md5:	bbe1803ca4e4c4a5b88fa24d9d0b3911
 Patch0:		%{name}-pci_module_init.patch
+Patch1:		%{name}-2.6.24.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
@@ -53,7 +54,12 @@
 %setup -q -n %{name}_v%{version}
 %{__sed} -i -e 's,\r$,,' src/*.c
 %patch0 -p1
+%patch1 -p1
 
+cat > src/Makefile << EOF
+r1000-objs := r1000_n.o r1000_ioctl.o                                                              
+obj-m += r1000.o
+EOF
 %build
 %build_kernel_modules -m r1000 -C src
 
@@ -72,7 +78,7 @@
 
 %files -n kernel%{_alt_kernel}-net-r1000
 %defattr(644,root,root,755)
-%doc README release_note.txt
+%doc readme release_note.txt
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/r1000.ko*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -81,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2008-03-03 01:06:05  zbyniu
+- up to 1.07; patch for new kernels
+
 Revision 1.17  2008-02-11 11:32:54  arekm
 - rel 5
 
================================================================

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



More information about the pld-cvs-commit mailing list