rpms/nvidia-173xx-kmod/F-20 nvidia-173xx-kmod.spec,1.87,1.88
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2892/F-20
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
Fix build
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- nvidia-173xx-kmod.spec 18 Jul 2014 15:53:33 -0000 1.87
+++ nvidia-173xx-kmod.spec 18 Jul 2014 16:01:30 -0000 1.88
@@ -3,16 +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
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-173xx-kmod
Version: 173.14.39
# Taken over by kmodtool
-<<<<<<< nvidia-173xx-kmod.spec
-Release: 6%{?dist}.12
-=======
-Release: 2%{?dist}
->>>>>>> 1.85
+Release: 3%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,27 +90,15 @@
%changelog
-* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com>
+* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.39-3
- Rebuilt for kernel
-* Thu Jul 17 2014 Nicolas Chauvet <kwizart(a)gmail.com>
-- Rebuilt for kernel
-
-<<<<<<< nvidia-173xx-kmod.spec
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-6.10
-- Rebuilt for kernel
-
-=======
* Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-2
- fix tag issue
* Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-1
- Update to 173.14.39
->>>>>>> 1.85
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-6.9
-- Rebuilt for kernel
-
* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-6.8
- Rebuilt for kernel