[svn] r6094 - trunk/rpms/dkms-r1000

[packagers at lists.rpmforge.net]

Author: thias
Date: 2008-01-14 11:43:10 +0100 (Mon, 14 Jan 2008)
New Revision: 6094

Added:
   trunk/rpms/dkms-r1000/r1000_v1.05-pci_register_driver.patch
   trunk/rpms/dkms-r1000/r1000_v1.06-modversions.patch
Modified:
   trunk/rpms/dkms-r1000/dkms-r1000.spec
Log:
Update dkms-r1000 to 1.06 + fixes and addd missing make requirement.


Modified: trunk/rpms/dkms-r1000/dkms-r1000.spec
===================================================================
--- trunk/rpms/dkms-r1000/dkms-r1000.spec	2008-01-14 10:27:23 UTC (rev 6093)
+++ trunk/rpms/dkms-r1000/dkms-r1000.spec	2008-01-14 10:43:10 UTC (rev 6094)
@@ -4,15 +4,17 @@
 
 Summary: Driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
 Name: dkms-r1000
-Version: 1.05
-Release: 1
-License: GPL
+Version: 1.06
+Release: 2
+License: GPL+
 Group: System Environment/Kernel
 URL: http://www.realtek.com.tw/
 Source: ftp://61.56.86.122/cn/nic/r1000_v%{version}.tgz
+Patch0: r1000_v1.05-pci_register_driver.patch
+Patch1: r1000_v1.06-modversions.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-Requires: gcc
+Requires: gcc, make
 Requires(post): dkms
 Requires(preun): dkms
 
@@ -23,6 +25,8 @@
 
 %prep
 %setup -n r1000_v%{version}
+%patch0 -p1 -b .pci_register_driver
+%patch1 -p1 -b .modversions
 
 
 %build
@@ -43,6 +47,8 @@
 %{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
 PACKAGE_NAME=%{dkms_name}
 PACKAGE_VERSION=%{dkms_vers}
+MAKE[0]="make KVER=${kernelver}"
+CLEAN[0]="make clean"
 BUILT_MODULE_NAME[0]=%{dkms_name}
 DEST_MODULE_LOCATION[0]=/kernel/drivers/net
 AUTOINSTALL="YES"
@@ -66,12 +72,19 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc release_note.txt README
 %{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Mon Jan 14 2007 Matthias Saou <http://freshrpms.net/> 1.06-2
+- Add missing make requirement.
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.06-1
+- Update to 1.06 (the upstream 1.07 tarball is completely busted!).
+- Include patch s/pci_module_init/pci_register_driver/ for recent kernels.
+
 * Wed Dec  6 2006 Ugo Viti <http://www.initzero.it> 1.05-1
 - Updated to 1.05 release.
 

Added: trunk/rpms/dkms-r1000/r1000_v1.05-pci_register_driver.patch
===================================================================
--- trunk/rpms/dkms-r1000/r1000_v1.05-pci_register_driver.patch	                        (rev 0)
+++ trunk/rpms/dkms-r1000/r1000_v1.05-pci_register_driver.patch	2008-01-14 10:43:10 UTC (rev 6094)
@@ -0,0 +1,12 @@
+diff -Naupr r1000_v1.05.orig/src/r1000_n.c r1000_v1.05/src/r1000_n.c
+--- r1000_v1.05.orig/src/r1000_n.c	2006-11-15 03:50:32.000000000 +0100
++++ r1000_v1.05/src/r1000_n.c	2007-10-22 17:24:22.000000000 +0200
+@@ -1718,7 +1718,7 @@ static struct pci_driver r1000_pci_drive
+ 
+ static int __init r1000_init_module (void)
+ {
+-	return pci_module_init (&r1000_pci_driver);	// pci_register_driver (drv)
++	return pci_register_driver (&r1000_pci_driver);
+ }
+ 
+ static void __exit r1000_cleanup_module (void)

Added: trunk/rpms/dkms-r1000/r1000_v1.06-modversions.patch
===================================================================
--- trunk/rpms/dkms-r1000/r1000_v1.06-modversions.patch	                        (rev 0)
+++ trunk/rpms/dkms-r1000/r1000_v1.06-modversions.patch	2008-01-14 10:43:10 UTC (rev 6094)
@@ -0,0 +1,12 @@
+diff -Naupr r1000_v1.06.orig/src/Makefile_linux24x r1000_v1.06/src/Makefile_linux24x
+--- r1000_v1.06.orig/src/Makefile_linux24x	2006-07-07 07:20:09.000000000 +0200
++++ r1000_v1.06/src/Makefile_linux24x	2007-10-22 17:46:24.000000000 +0200
+@@ -14,7 +14,7 @@ endif
+ #standard flags for module builds
+ MODCFLAGS	+= -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall
+ MODCFLAGS	+= -I$(KSRC)/include -I.
+-MODCFLAGS	+= -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h
++MODCFLAGS	+= -DEXPORT_SYMTAB
+ SOURCE		:= r1000_n.c r1000_ioctl.c
+ OBJS		:= $(SOURCE:.c=.o)
+