rpms/openafs-kmod/F-15 openafs-kmod.spec,1.15,1.16

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/openafs-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22527

Modified Files:
	openafs-kmod.spec 
Log Message:
* Sun Oct 30 2011 Nicolas Chauvet <kwizart at gmail.com>
- rebuild for updated kernel



Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-15/openafs-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openafs-kmod.spec	14 Oct 2011 17:54:48 -0000	1.15
+++ openafs-kmod.spec	30 Oct 2011 10:59:09 -0000	1.16
@@ -23,7 +23,11 @@
 Name:           %{kmod_name}-kmod
 
 Version:        1.6.0
+<<<<<<< openafs-kmod.spec
+Release:        1%{?dist}.3
+=======
 Release:        2%{?dist}
+>>>>>>> 1.15
 Summary:        Kernel module(s)
 
 Group:          System Environment/Kernel
@@ -96,10 +100,19 @@
 
 
 %changelog
+* Sun Oct 30 2011 Nicolas Chauvet <kwizart at gmail.com>
+- rebuild for updated kernel
+
+<<<<<<< openafs-kmod.spec
+* Wed Oct 19 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.6.0-1.2
+- rebuild for updated kernel
+
+=======
 * Fri Oct 14 2011 Jack Neely <jjneely at ncsu.edu> 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 at gmail.com> - 1.6.0-1.1
 - rebuild for updated kernel