rpms/nvidia-173xx-kmod/F-20 nvidia-173xx-kmod.spec,1.85,1.86

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	nvidia-173xx-kmod.spec 
Log Message:
* Thu Jul 17 2014 Nicolas Chauvet <kwizart at gmail.com>
- Rebuilt for kernel



Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nvidia-173xx-kmod.spec	8 Jul 2014 10:08:31 -0000	1.85
+++ nvidia-173xx-kmod.spec	17 Jul 2014 18:53:39 -0000	1.86
@@ -3,12 +3,16 @@
 # "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 newest
 
 Name:          nvidia-173xx-kmod
 Version:       173.14.39
 # Taken over by kmodtool
+<<<<<<< nvidia-173xx-kmod.spec
+Release:       6%{?dist}.11
+=======
 Release:       2%{?dist}
+>>>>>>> 1.85
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -90,12 +94,21 @@
 
 
 %changelog
+* Thu Jul 17 2014 Nicolas Chauvet <kwizart at gmail.com>
+- Rebuilt for kernel
+
+<<<<<<< nvidia-173xx-kmod.spec
+* Tue Jul 08 2014 Nicolas Chauvet <kwizart at gmail.com> - 173.14.38-6.10
+- Rebuilt for kernel
+
+=======
 * Tue Jul 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-2
 - fix tag issue
 
 * Tue Jul 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 173.14.39-1
 - Update to 173.14.39
 
+>>>>>>> 1.85
 * Tue Jul 08 2014 Nicolas Chauvet <kwizart at gmail.com> - 173.14.38-6.9
 - Rebuilt for kernel