Author: jjneely Update of /cvs/free/rpms/openafs-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv16854 Modified Files: openafs-kmod.spec Log Message: Finish correcting the conflicts. Index: openafs-kmod.spec =================================================================== RCS file: /cvs/free/rpms/openafs-kmod/F-12/openafs-kmod.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openafs-kmod.spec 15 Mar 2010 21:42:02 -0000 1.13 +++ openafs-kmod.spec 15 Mar 2010 21:44:15 -0000 1.14 @@ -102,11 +102,9 @@ %changelog -<<<<<<< openafs-kmod.spec * Mon Mar 15 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.4.12-1 - Update to OpenAFS 1.4.12 -======= * Fri Mar 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.11-6.9 - rebuild for new kernel @@ -134,7 +132,6 @@ * Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.11-6.1 - rebuild for new kernel ->>>>>>> 1.12 * Mon Jan 11 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.4.11-6 - Build with --disable-linux-syscall-probing to fix compile issues on PPC. Syscall probing is useless on modern linux kernels