rpms/staging-kmod/F-20 staging-kmod.spec,1.34,1.35

Author: kwizart Update of /cvs/free/rpms/staging-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7698 Modified Files: staging-kmod.spec Log Message: Yep Index: staging-kmod.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- staging-kmod.spec 7 Feb 2014 13:04:25 -0000 1.34 +++ staging-kmod.spec 9 Feb 2014 10:28:46 -0000 1.35 @@ -26,11 +26,7 @@ Name: staging-kmod Version: 3.12.6 -<<<<<<< staging-kmod.spec -Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.2 -======= -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.6 ->>>>>>> 1.32 +Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.6 Summary: Selected kernel modules from linux-staging Group: System Environment/Kernel @@ -150,10 +146,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- Rebuilt for kernel - -* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; +* Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-2.6 - Rebuilt for kernel * Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.5