rpms/nvidia-kmod/F-18 conftest.patch, 1.1, 1.2 nvidia-kmod.spec, 1.124, 1.125

Author: kwizart Update of /cvs/nonfree/rpms/nvidia-kmod/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31264/F-18 Modified Files: conftest.patch nvidia-kmod.spec Log Message: Fix 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-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 14:50:19 -0000 1.1 +++ conftest.patch 15 Feb 2013 18:19:57 -0000 1.2 @@ -1,11 +1,24 @@ +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 -@@ -1703,7 +1703,7 @@ case "$6" in +@@ -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-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- nvidia-kmod.spec 13 Feb 2013 19:45:03 -0000 1.124 +++ nvidia-kmod.spec 15 Feb 2013 18:19:57 -0000 1.125 @@ -9,7 +9,7 @@ Epoch: 1 Version: 304.64 # Taken over by kmodtool -Release: 4%{?dist}.1 +Release: 5%{?dist}.1 Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -88,6 +88,9 @@ %changelog +* Fri Feb 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-5.1 +- Fix with a better patch from gentoo + * Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-4.1 - Rebuilt for kernel