rpms/openafs-kmod/F-15 openafs-kmod.spec,1.19,1.20

Author: kwizart Update of /cvs/free/rpms/openafs-kmod/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11217 Modified Files: openafs-kmod.spec Log Message: Fix build for new kernel Index: openafs-kmod.spec =================================================================== RCS file: /cvs/free/rpms/openafs-kmod/F-15/openafs-kmod.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openafs-kmod.spec 23 Nov 2011 10:04:57 -0000 1.19 +++ openafs-kmod.spec 23 Nov 2011 19:36:19 -0000 1.20 @@ -23,11 +23,7 @@ Name: %{kmod_name}-kmod Version: 1.6.0 -<<<<<<< openafs-kmod.spec -Release: 1%{?dist}.6 -======= -Release: 2%{?dist} ->>>>>>> 1.15 +Release: 2%{?dist}.1 Summary: Kernel module(s) Group: System Environment/Kernel @@ -100,28 +96,13 @@ %changelog -* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; +* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0:1.6.0-2.1 - rebuild for updated kernel -* Sun Nov 13 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- rebuild for updated kernel - -* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- rebuild for updated kernel - -* Sun Oct 30 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; -- rebuild for updated kernel - -<<<<<<< openafs-kmod.spec -* Wed Oct 19 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.6.0-1.2 -- rebuild for updated kernel - -======= * Fri Oct 14 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-2 - rpmFusion Bug # 1938 Patch from Ken Dreyer - correct akmod package build deps ->>>>>>> 1.15 * Fri Oct 07 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.6.0-1.1 - rebuild for updated kernel