rpms/nvidia-340xx-kmod/F-20 nvidia-340xx-kmod.spec, 1.4, 1.5 3.18_kernel.patch, 1.1, NONE 3.19_kernel.patch, 1.2, NONE

[Przemysław Palacz]

Author: przemal

Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2055

Modified Files:
	nvidia-340xx-kmod.spec 
Removed Files:
	3.18_kernel.patch 3.19_kernel.patch 
Log Message:
* Wed Jan 28 2015 Przemysław Palacz <pprzemal at gmail.com> - 1:340.76-1
- Update to 340.76
- Drop kernel 3.18 patch
- Drop kernel 3.19 patch
- Do not build uvm driver on architectures other than x86_64 (follow main)



Index: nvidia-340xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/nvidia-340xx-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-340xx-kmod.spec	27 Jan 2015 13:34:29 -0000	1.4
+++ nvidia-340xx-kmod.spec	1 Feb 2015 20:09:34 -0000	1.5
@@ -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
-%global buildforkernels current
+%global buildforkernels akmod
 
 Name:          nvidia-340xx-kmod
 Epoch:         1
-Version:       340.65
+Version:       340.76
 # Taken over by kmodtool
-Release:       4%{?dist}
+Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -17,8 +17,8 @@
 
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        nv-linux-arm.patch
-Patch1:        3.18_kernel.patch
-Patch2:        3.19_kernel.patch
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
 ExclusiveArch:  i686 x86_64 armv7hl
@@ -44,8 +44,6 @@
 tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
 # patch loop
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 for kernel_version  in %{?kernel_versions} ; do
     cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -62,12 +60,14 @@
         module
   popd
 %{!?_nv_build_module_instances:
+%ifarch x86_64
   pushd _kmod_build_${kernel_version%%___*}/uvm
     make %{?_smp_mflags} \
         KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
         IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
         module
   popd
+%endif
 }
 done
 
@@ -76,7 +76,11 @@
 rm -rf $RPM_BUILD_ROOT
 for kernel_version in %{?kernel_versions}; do
     mkdir -p  $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+%ifarch x86_64
     install -D -m 0755 _kmod_build_${kernel_version%%___*}/{,uvm}/nvidia*.ko \
+%else
+    install -D -m 0755 _kmod_build_${kernel_version%%___*}/nvidia.ko \
+%endif
          $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
 done
 %{?akmod_install}
@@ -87,6 +91,12 @@
 
 
 %changelog
+* Wed Jan 28 2015 Przemysław Palacz <pprzemal at gmail.com> - 1:340.76-1
+- Update to 340.76
+- Drop kernel 3.18 patch
+- Drop kernel 3.19 patch
+- Do not build uvm driver on architectures other than x86_64 (follow main)
+
 * Tue Jan 27 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:340.65-4
 - revert commit (don't replace main driver)
 - fix 3.19 patch for rc6


--- 3.18_kernel.patch DELETED ---


--- 3.19_kernel.patch DELETED ---