rpms/nvidia-173xx-kmod/F-18 conftest.patch, 1.1, 1.2 nvidia-173xx-kmod.spec, 1.60, 1.61

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	conftest.patch nvidia-173xx-kmod.spec 
Log Message:
Update with a better patch from gentoo


conftest.patch:
 conftest.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: conftest.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/conftest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conftest.patch	5 Feb 2013 15:11:20 -0000	1.1
+++ conftest.patch	15 Feb 2013 18:21:29 -0000	1.2
@@ -1,11 +1,24 @@
---- a/usr/src/nv/conftest.sh
-+++ b/usr/src/nv/conftest.sh
-@@ -1703,7 +1703,7 @@ case "$6" in
+the nvidia drivers are trying to test for version 2.6.6, but fail to take into
+account the first digit.  so 3.7.0+ ends up failing the test.
+
+https://bugs.gentoo.org/447566
+
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1697,13 +1697,15 @@
+                 # kernel older than 2.6.6, that's all we require to
+                 # build the module.
+                 #
++                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
+                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
                  SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
  
-                 if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
--                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-+                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then
+-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
++                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
++                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
                      SELECTED_MAKEFILE=Makefile.kbuild
                      RET=0
                  fi
+             fi
+         fi


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/nvidia-173xx-kmod.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- nvidia-173xx-kmod.spec	13 Feb 2013 19:44:49 -0000	1.60
+++ nvidia-173xx-kmod.spec	15 Feb 2013 18:21:29 -0000	1.61
@@ -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 newest
 
 Name:          nvidia-173xx-kmod
 Version:       173.14.36
 # Taken over by kmodtool
-Release:       3%{?dist}.1
+Release:       4%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Feb 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 173.14.36-4
+- Fix with a better patch from gentoo
+
 * Wed Feb 13 2013 Nicolas Chauvet <kwizart at gmail.com> - 173.14.36-3.1
 - Rebuilt for kernel