rpms/nvidia-kmod/F-17 conftest.patch, 1.1, 1.2 nvidia-kmod.spec, 1.161, 1.162

Author: kwizart Update of /cvs/nonfree/rpms/nvidia-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4603/F-17 Modified Files: conftest.patch nvidia-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-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:06:02 -0000 1.1 +++ conftest.patch 16 Feb 2013 17:35:52 -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-17/nvidia-kmod.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- nvidia-kmod.spec 16 Feb 2013 12:00:16 -0000 1.161 +++ nvidia-kmod.spec 16 Feb 2013 17:35:52 -0000 1.162 @@ -3,13 +3,13 @@ # "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-kmod Epoch: 1 Version: 304.64 # Taken over by kmodtool -Release: 3%{?dist}.2 +Release: 6%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -27,6 +27,7 @@ Patch0: 3.7_kernel.patch Patch1: conftest.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -87,59 +88,50 @@ %changelog -* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-3.2 -- Rebuilt for kernel +* Fri Feb 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-6 +- Fix with a better patch from gentoo -* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-3.1 +* Wed Feb 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-4.1 - Rebuilt for kernel +* Tue Feb 05 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:304.64-4 +- Rebuilt as I forgot to change to current + * Tue Feb 05 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:304.64-3 - patch for 3.7.6 kernel compile issue * Tue Feb 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.6 - Rebuilt for kernel -* Mon Feb 04 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.5 -- Rebuilt for akmod - -* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.4 -- Rebuilt for akmod - -* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.3 +* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.5 - Rebuilt for updated kernel -* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.2 +* Fri Jan 25 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.4 - Rebuilt for updated kernel -* Sat Jan 19 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.1 +* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.3 - Rebuilt for updated kernel -* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:304.64-2 -- patch for 3.7 kernel - -* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.8 +* Mon Jan 14 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.2 - Rebuilt for updated kernel -* Wed Jan 09 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.7 +* Sun Jan 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-2.1 - Rebuilt for updated kernel -* Sun Dec 23 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.6 -- Rebuilt for updated kernel +* Sun Jan 06 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:304.64-2 +- patched and rebuilt for 3.7 kernel -* Sat Dec 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.5 -- Rebuilt for updated kernel - -* Tue Dec 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.4 -- Rebuilt for updated kernel +* Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.4 +- Rebuilt for f18 final kernel -* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.3 -- Rebuilt for updated kernel +* Fri Dec 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.3 +- Rebuilt for current f18 kernel -* Wed Dec 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.2 -- Rebuilt for updated kernel +* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.2 +- Rebuilt for current f18 kernel -* Wed Nov 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.1 -- Rebuilt for updated kernel +* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1.1 +- Rebuilt for Fedora 18 Beta kernel * Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:304.64-1 - Update to 304.64