rpms/nvidia-173xx-kmod/devel 3.7_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.46, 1.47 sources, 1.11, 1.12

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-173xx-kmod.spec sources 
Added Files:
	3.7_kernel.patch 
Log Message:
update to 173.14.36

3.7_kernel.patch:
 conftest.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE 3.7_kernel.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -127,6 +127,7 @@ build_cflags() {
         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
         fi
         if [ "$XEN_PRESENT" != "0" ]; then
             MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
@@ -136,6 +137,7 @@ build_cflags() {
         if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+            MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
         fi
         if [ "$XEN_PRESENT" != "0" ]; then
             MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
@@ -143,9 +145,12 @@ build_cflags() {
     fi
 
     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+    CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
 
     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+        CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
     fi
     if [ -n "$BUILD_PARAMS" ]; then
         CFLAGS="$CFLAGS -D$BUILD_PARAMS"


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/nvidia-173xx-kmod.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nvidia-173xx-kmod.spec	8 Nov 2012 22:26:07 -0000	1.46
+++ nvidia-173xx-kmod.spec	16 Nov 2012 15:46:07 -0000	1.47
@@ -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.35
+Version:       173.14.36
 # Taken over by kmodtool
-Release:       2%{?dist}.7
+Release:       1%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -23,7 +23,7 @@
 # </switch me>
 #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
 
-Patch0:        3.6_kernel.patch
+Patch0:        3.7_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +95,11 @@
 
 
 %changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- Adds support for xserver ABI 13 (xorg-server 1.13)
+- Try to patch for 3.7 kernel
+
 * Thu Nov 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 173.14.35-2.7
 - Rebuilt for updated kernel
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Jun 2012 09:23:53 -0000	1.11
+++ sources	16 Nov 2012 15:46:07 -0000	1.12
@@ -1 +1 @@
-7f7637fdf254d906e2a677cbb8622428  nvidia-kmod-data-173.14.35.tar.bz2
+64bddf592e61efb23d6a65be0bd0e661  nvidia-kmod-data-173.14.36.tar.bz2