rpms/nvidia-kmod/devel conftest.patch, NONE, 1.1 nvidia-kmod.spec, 1.112, 1.113

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-kmod.spec 
Added Files:
	conftest.patch 
Log Message:
* Sun Feb 17 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:313.18-2
- Fix with a better patch from gentoo


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

--- NEW FILE conftest.patch ---
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 \
+                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-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- nvidia-kmod.spec	16 Jan 2013 13:57:24 -0000	1.112
+++ nvidia-kmod.spec	17 Feb 2013 09:19:43 -0000	1.113
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       313.18
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -25,6 +25,7 @@
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
 Patch0:         3.8_kernel.patch
+Patch1:         conftest.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +53,7 @@
 do
 pushd nvidiapkg-${arch}
 %patch0 -p1
+%patch1 -p1
 popd
 done
 
@@ -85,6 +87,9 @@
 
 
 %changelog
+* Sun Feb 17 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:313.18-2
+- Fix with a better patch from gentoo
+
 * Wed Jan 16 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:313.18-1
 - Update to 313.18 (adds xorg-server 1.14 ABI support)
 - patch for 3.8rc kernel