Author: kwizart Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4795/F-17 Modified Files: conftest.patch nvidia-173xx-kmod.spec Log Message: Update patch conftest.patch: conftest.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: conftest.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/conftest.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- conftest.patch 5 Feb 2013 15:13:38 -0000 1.1 +++ conftest.patch 16 Feb 2013 17:37:30 -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-17/nvidia-173xx-kmod.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- nvidia-173xx-kmod.spec 16 Feb 2013 11:59:57 -0000 1.93 +++ nvidia-173xx-kmod.spec 16 Feb 2013 17:37:30 -0000 1.94 @@ -8,7 +8,7 @@ Name: nvidia-173xx-kmod Version: 173.14.36 # Taken over by kmodtool -Release: 2%{?dist}.2 +Release: 4%{?dist}.2 Summary: NVIDIA 173xx display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -22,7 +22,6 @@ #Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers... # </switch me> #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727 - Patch0: 3.7_kernel.patch Patch1: conftest.patch @@ -53,7 +52,9 @@ do pushd nvidiapkg-${arch} %patch0 -p1 -%patch1 -p1 + pushd usr/src/nv +%patch1 -p2 + popd popd done @@ -97,66 +98,57 @@ %changelog -* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.2 +* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-4.2 - Rebuilt for kernel -* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.1 +* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-4.1 - Rebuilt for kernel -* Tue Feb 05 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-2 -- patch for 3.7.6 kernel compile issue +* Fri Feb 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-4 +- Fix with a better patch from gentoo -* Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.6 +* Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-3.1 - Rebuilt for kernel -* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.5 -- Rebuilt for akmod +* Tue Feb 05 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-3 +- patch for 3.7.6 kernel compile issue -* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.4 -- Rebuilt for akmod +* Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.6 +- Rebuilt for kernel -* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.3 +* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.5 - Rebuilt for updated kernel -* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.2 +* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.4 - Rebuilt for updated kernel -* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.1 +* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.3 - Rebuilt for updated kernel -* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-1 -- Update to 173.14.36 -- patch for 3.7 kernel - -* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.17 +* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.2 - Rebuilt for updated kernel -* Wed Jan 09 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.16 +* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-2.1 - Rebuilt for updated kernel -* Sun Dec 23 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.15 -- Rebuilt for updated kernel +* Tue Jan 08 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-2 +- patched and rebuilt for 3.7 kernel -* Sat Dec 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.14 -- Rebuilt for updated kernel +* Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.4 +- Rebuilt for f18 final kernel -* Tue Dec 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.13 -- Rebuilt for updated kernel +* Fri Dec 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.3 +- Rebuilt for current f18 kernel -* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.12 -- Rebuilt for updated kernel - -* Wed Dec 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.11 -- Rebuilt for updated kernel - -* Wed Nov 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.10 -- Rebuilt for updated kernel +* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.2 +- Rebuilt for current f18 kernel -* Wed Nov 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.9 -- Rebuilt for updated kernel +* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.1 +- Rebuilt for Fedora 18 Beta kernel -* Tue Nov 20 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.8 -- Rebuilt for updated kernel +* Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-1 +- Update to 173.14.36 +- Adds support for xserver ABI 13 (xorg-server 1.13) * Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.7 - Rebuilt for updated kernel