rpms/nvidia-kmod/F-15 nvidia-kmod.spec,1.131,1.132 sources,1.37,1.38

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16724/F-15

Modified Files:
	nvidia-kmod.spec sources 
Log Message:
Revert to 280 serie for stable updates rebuilt



Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- nvidia-kmod.spec	23 Jun 2012 09:31:32 -0000	1.131
+++ nvidia-kmod.spec	26 Jun 2012 13:09:08 -0000	1.132
@@ -7,9 +7,9 @@
 
 Name:          nvidia-kmod
 Epoch:         1
-Version:       295.59
+Version:       280.13
 # Taken over by kmodtool
-Release:       1%{?dist}.1
+Release:       4%{?dist}.5
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -19,12 +19,15 @@
 #ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
 
 # <switch me> when sources are on kwizart's repo
-Source0:       http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
+Source0:       http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
 #Source0:       http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{version}.tar.bz2
 # </switch me>
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
 
+Patch0:         kernel-3.3.patch
+#http://nvidia.custhelp.com/app/answers/detail/a_id/3109
+Patch1:         nvidia-blacklist-register-mapping-256-285.diff
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +50,14 @@
 kmodtool  --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
 %setup -q -c -T -a 0
 
+# patch loop
+for arch in x86 x64
+do
+pushd nvidiapkg-${arch}
+%patch0 -p1
+%patch1 -p0
+popd
+done
 
 for kernel_version  in %{?kernel_versions} ; do
 %ifarch %{ix86}
@@ -56,11 +67,21 @@
 %endif
 done
 
+
 %build
 for kernel_version in %{?kernel_versions}; do
-  pushd _kmod_build_${kernel_version%%___*}/kernel/
-    make %{?_smp_mflags}  SYSSRC="${kernel_version##*___}" module
-  popd
+    pushd _kmod_build_${kernel_version%%___*}/kernel/
+    ln -s -f Makefile.kbuild Makefile
+        if [[ "${kernel_version%%___*}" = *xen ]] ; then
+            CC="cc -D__XEN_TOOLS__ \
+            -I${kernel_version##*___}/include/asm/mach-xen" \
+            IGNORE_XEN_PRESENCE=1 \
+            make %{?_smp_mflags}  SYSSRC="${kernel_version##*___}" module
+        else
+            IGNORE_XEN_PRESENCE=1 \
+            make %{?_smp_mflags}  SYSSRC="${kernel_version##*___}" module
+        fi
+    popd
 done
 
 
@@ -77,21 +98,6 @@
 
 
 %changelog
-* Sat Jun 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:295.59-1.1
-- Rebuilt for updated kernel
-
-* Mon Jun 11 2012 leigh scott <leigh123linux at googlemail.com> - 1:295.59-1
-- Update to 295.59
-
-* Tue Jun 05 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:295.53-1.2
-- Rebuilt for updated kernel
-
-* Thu May 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:295.53-1.1
-- Rebuilt for updated kernel
-
-* Tue May 22 2012 leigh scott <leigh123linux at googlemail.com> - 1:295.53-1
-- Update to 295.53
-
 * Wed May 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:280.13-4.5
 - rebuild for updated kernel
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	11 Jun 2012 18:33:39 -0000	1.37
+++ sources	26 Jun 2012 13:09:09 -0000	1.38
@@ -1 +1 @@
-4ff9b2a6e8f99357610cc020adcd9689  nvidia-kmod-data-295.59.tar.xz
+c5728cbe2d975fcfb2cde71303032db3  nvidia-kmod-data-280.13.tar.bz2