rpms/openafs-kmod/F-18 openafs-kmod.spec,1.41,1.42

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15649

Modified Files:
	openafs-kmod.spec 
Log Message:
Resync sources



Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openafs-kmod.spec	21 Feb 2013 17:45:07 -0000	1.41
+++ openafs-kmod.spec	21 Feb 2013 17:57:07 -0000	1.42
@@ -21,11 +21,7 @@
 Name:           %{kmod_name}-kmod
 
 Version:        1.6.2
-<<<<<<< openafs-kmod.spec
-Release:        0.%{pre}%{?dist}.7
-=======
 Release:        1%{?dist}.1
->>>>>>> 1.40
 Summary:        Kernel module(s)
 
 Group:          System Environment/Kernel
@@ -100,31 +96,12 @@
 
 
 %changelog
-* Thu Feb 21 2013 Nicolas Chauvet <kwizart at gmail.com>
+* Thu Feb 21 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-1.1
 - Rebuilt for kernel
 
-<<<<<<< openafs-kmod.spec
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.6
-- Rebuilt for kernel
-
-* Sat Feb 16 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.5
-- Rebuilt for kernel
-
-* Wed Feb 13 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.4
-- Rebuilt for kernel
-
-* Tue Feb 05 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.3
-- Rebuilt for kernel
-
-* Wed Jan 30 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.2
-- Rebuilt for updated kernel
-
-* Fri Jan 25 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre3.1
-- Rebuilt for updated kernel
-=======
 * Thu Feb 14 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-1
 - Update to OpenAFS 1.6.2 final
->>>>>>> 1.40
+
 
 * Tue Jan 22 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-0.pre3
 - Update to OpenAFS 1.6.2 pre-release 3