rpms/nvidia-kmod/F-15 kernel-3.3.patch, NONE, 1.1 nvidia-kmod.spec, 1.119, 1.120

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-kmod.spec 
Added Files:
	kernel-3.3.patch 
Log Message:
* Tue Apr 03 2012 leigh scott <leigh123linux at googlemail.com> - 1:280.13-3
- 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/kernel/conftest.sh
+++ b/kernel/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-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- nvidia-kmod.spec	3 Apr 2012 17:30:08 -0000	1.119
+++ nvidia-kmod.spec	3 Apr 2012 18:28:17 -0000	1.120
@@ -3,13 +3,13 @@
 # "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-kmod
 Epoch:         1
 Version:       280.13
 # Taken over by kmodtool
-Release:       2%{?dist}.27
+Release:       3%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -25,6 +25,8 @@
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
 
+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,6 +48,13 @@
 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
+popd
+done
 
 for kernel_version  in %{?kernel_versions} ; do
 %ifarch %{ix86}
@@ -86,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 03 2012 leigh scott <leigh123linux at googlemail.com> - 1:280.13-3
+- patched to build with 3.3.0 kernel
+
 * Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:280.13-2.27
 - rebuild for updated kernel