rpms/nvidia-304xx-kmod/devel 3.18_kernel.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 nvidia-304xx-kmod.spec, 1.19, 1.20 sources, 1.7, 1.8

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26019

Modified Files:
	.cvsignore nvidia-304xx-kmod.spec sources 
Added Files:
	3.18_kernel.patch 
Log Message:
* Tue Dec 16 2014 Leigh Scott <leigh123linux at googlemail.com> - 304.125-1
- Update to 304.125


3.18_kernel.patch:
 nv-drm.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE 3.18_kernel.patch ---
--- a/kernel/nv-drm.c	2014-12-02 03:55:59.000000000 +0000
+++ b/kernel/nv-drm.c	2014-12-16 18:09:05.340107169 +0000
@@ -76,6 +76,10 @@ static struct drm_driver nv_drm_driver =
     .unload = nv_drm_unload,
     .fops = &nv_drm_fops,
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+    .set_busid = drm_pci_set_busid,
+#endif
+
     .name = "nvidia-drm",
     .desc = "NVIDIA DRM driver",
     .date = "20140818",


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Jul 2014 20:34:20 -0000	1.7
+++ .cvsignore	16 Dec 2014 18:15:17 -0000	1.8
@@ -1 +1 @@
-nvidia-kmod-data-304.123.tar.xz
+nvidia-kmod-data-304.125.tar.xz


Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nvidia-304xx-kmod.spec	14 Dec 2014 15:03:51 -0000	1.19
+++ nvidia-304xx-kmod.spec	16 Dec 2014 18:15:17 -0000	1.20
@@ -3,12 +3,12 @@
 # "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
-%global buildforkernels newest
+%global buildforkernels current
 
 Name:          nvidia-304xx-kmod
-Version:       304.123
+Version:       304.125
 # Taken over by kmodtool
-Release:       2%{?dist}.1
+Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -20,6 +20,8 @@
 
 Source11:      nvidia-304xx-kmodtool-excludekernel-filterfile
 
+Patch0:        3.18_kernel.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -45,7 +47,7 @@
 for arch in x86 x64
 do
 pushd nvidiapkg-${arch}
- echo 'no patch'
+%patch0 -p1
 popd
 done
 
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Tue Dec 16 2014 Leigh Scott <leigh123linux at googlemail.com> - 304.125-1
+- Update to 304.125
+
 * Sun Dec 14 2014 Nicolas Chauvet <kwizart at gmail.com> - 304.123-2.1
 - Rebuilt for kernel
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Jul 2014 20:34:20 -0000	1.7
+++ sources	16 Dec 2014 18:15:17 -0000	1.8
@@ -1 +1 @@
-ba43b5a5f4c780260756cc8b721470bb  nvidia-kmod-data-304.123.tar.xz
+5fea73d34516755e119c0b97e960562c  nvidia-kmod-data-304.125.tar.xz