Author: kwizart Update of /cvs/free/rpms/ndiswrapper-kmod/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22911 Modified Files: ndiswrapper-kmod.spec Log Message: * Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - Rebuilt for kernel Index: ndiswrapper-kmod.spec =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ndiswrapper-kmod.spec 15 May 2013 23:18:07 -0000 1.59 +++ ndiswrapper-kmod.spec 12 Jun 2013 10:47:47 -0000 1.60 @@ -3,14 +3,18 @@ # "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 #global pre rc1 Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod Version: 1.58 +<<<<<<< ndiswrapper-kmod.spec +Release: 1%{?pre}%{?dist}.4 +======= Release: 2%{?pre}%{?dist} +>>>>>>> 1.59 License: GPLv2 Group: System Environment/Kernel URL: http://ndiswrapper.sourceforge.net @@ -77,9 +81,18 @@ %changelog +* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; +- Rebuilt for kernel + +<<<<<<< ndiswrapper-kmod.spec +* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.58-1.3 +- Rebuilt for kernel + +======= * Wed May 15 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.58-2 - patch for 3.9 kernel +>>>>>>> 1.59 * Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.58-1.2 - Rebuilt for kernel