rpms/nvidia-173xx-kmod/F-15 kernel-3.3.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.68, 1.69

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13760

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	kernel-3.3.patch 
Log Message:
* Tue Apr 03 2012 leigh scott <leigh123linux at googlemail.com> - 173.14.31-2
- patched to build with 3.3.0 kernel


kernel-3.3.patch:
 conftest.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kernel-3.3.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -122,7 +122,7 @@ build_cflags() {
     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
 
     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated"
     fi
     if [ -n "$BUILD_PARAMS" ]; then
         CFLAGS="$CFLAGS -D$BUILD_PARAMS"


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-15/nvidia-173xx-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- nvidia-173xx-kmod.spec	3 Apr 2012 17:29:57 -0000	1.68
+++ nvidia-173xx-kmod.spec	4 Apr 2012 08:01:25 -0000	1.69
@@ -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
-%define buildforkernels newest
+%define buildforkernels current
 
 Name:          nvidia-173xx-kmod
 Version:       173.14.31
 # Taken over by kmodtool
-Release:       1%{?dist}.27
+Release:       2%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -23,6 +23,8 @@
 # </switch me>
 #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
 
+Patch0:         kernel-3.3.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -46,12 +48,12 @@
 %setup -q -c -T -a 0
 
 # patch loop
-#for arch in x86 x64
-#do
-#    pushd nvidiapkg-${arch}
-# empty
-#    popd
-#done
+for arch in x86 x64
+do
+pushd nvidiapkg-${arch}
+%patch0 -p1
+popd
+done
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -93,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 03 2012 leigh scott <leigh123linux at googlemail.com> - 173.14.31-2
+- patched to build with 3.3.0 kernel
+
 * Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 173.14.31-1.27
 - rebuild for updated kernel