Author: kwizart Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26683/devel Modified Files: nvidia-173xx-kmod.spec Added Files: 3.6_kernel.patch Log Message: Sync with F-17 3.6_kernel.patch: nvacpi.c | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE 3.6_kernel.patch --- --- a/usr/src/nv/nvacpi.c +++ b/usr/src/nv/nvacpi.c @@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de if (pNvAcpiObject->notify_handler_installed) { // no status returned for this function +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + acpi_os_wait_events_complete(); +#else acpi_os_wait_events_complete(NULL); +#endif // remove event notifier status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); Index: nvidia-173xx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/nvidia-173xx-kmod.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- nvidia-173xx-kmod.spec 16 Jun 2012 09:20:22 -0000 1.44 +++ nvidia-173xx-kmod.spec 8 Nov 2012 22:24:15 -0000 1.45 @@ -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 current +%define buildforkernels newest Name: nvidia-173xx-kmod Version: 173.14.35 # Taken over by kmodtool -Release: 1%{?dist} +Release: 2%{?dist}.7 Summary: NVIDIA 173xx display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -23,6 +23,8 @@ # </switch me> #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727 +Patch0: 3.6_kernel.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -46,12 +48,12 @@ %setup -q -c -T -a 0 # patch loop -#for arch in x86 x64 -#do -# pushd nvidiapkg-${arch} -# empty -# popd -#done +for arch in x86 x64 +do + pushd nvidiapkg-${arch} +%patch0 -p1 + popd +done for kernel_version in %{?kernel_versions} ; do @@ -93,9 +95,96 @@ %changelog +* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.7 +- Rebuilt for updated kernel + +* Thu Nov 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.6 +- Rebuilt for updated kernel + +* Tue Oct 23 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.5 +- Rebuilt for updated kernel + +* Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.4 +- Rebuilt for updated kernel + +* Thu Oct 11 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.3 +- Rebuilt for updated kernel + +* Mon Oct 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.2 +- Rebuilt for updated kernel + +* Wed Oct 03 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-2.1 +- Rebuilt for updated kernel + +* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.35-2 +- patch for 3.6 kernel + +* Thu Sep 27 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.13 +- Rebuilt for updated kernel + +* Mon Sep 17 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.12 +- Rebuilt for updated kernel + +* Fri Aug 31 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.11 +- Rebuilt for updated kernel + +* Wed Aug 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.10 +- Rebuilt for updated kernel + +* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.9 +- Rebuilt for updated kernel + +* Sat Aug 11 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.8 +- Rebuilt for updated kernel + +* Tue Jul 31 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.7 +- Rebuilt for updated kernel + +* Sat Jul 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.6 +- Rebuilt for updated kernel + +* Tue Jul 17 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.5 +- Rebuilt for updated kernel + +* Fri Jul 06 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.4 +- Rebuilt for updated kernel + +* Thu Jun 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.3 +- Rebuilt for updated kernel + +* Thu Jun 21 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.2 +- Rebuilt for updated kernel + +* Sun Jun 17 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.35-1.1 +- Rebuilt for updated kernel + * Tue Jun 05 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 173.14.35-1 - Update to 173.14.35 +* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.34-1.3 +- Rebuilt for updated kernel + +* Sun May 27 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.34-1.2 +- Rebuilt for updated kernel + +* Sat May 26 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.34-1.1 +- Rebuilt for release kernel + +* Sat May 19 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 173.14.34-1 +- Update to 173.14.34 + +* Sat Apr 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.30-1.10 +- rebuild for updated kernel + +* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.30-1.9 +- rebuild for updated kernel + +* Mon Apr 16 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.30-1.8 +- rebuild for updated kernel + +* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.30-1.7 +- rebuild for beta kernel + * Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.30-1.6 - Rebuild for UsrMove