Fri Jan 25 10:09:42 CET 2013

Author: ktdreyer

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

Modified Files:
	.cvsignore openafs-kmod.spec sources 
Removed Files:
	openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch 
	openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch 
	openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch 
	openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch 
	openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch 
	openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch 
	openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch 
	openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch 
	openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch 
Log Message:
* Tue Jan 22 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-0.pre3
- Update to OpenAFS 1.6.2 pre-release 3



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10

--- .cvsignore	4 Apr 2012 19:18:10 -0000	1.9
+++ .cvsignore	25 Jan 2013 09:09:41 -0000	1.10
@@ -1 +1 @@
-openafs-1.6.1-src.tar.bz2
+openafs-1.6.2pre3-src.tar.bz2


Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openafs-kmod.spec	19 Jan 2013 23:44:02 -0000	1.65
+++ openafs-kmod.spec	25 Jan 2013 09:09:41 -0000	1.66
@@ -17,59 +17,22 @@
 
 %define kmod_name openafs
 
+%define pre pre3
+
 # name should have a -kmod suffix
 Name:           %{kmod_name}-kmod
 
-Version:        1.6.1
-Release:        4%{?dist}.15
+Version:        1.6.2
+Release:        0.%{pre}%{?dist}
 Summary:        Kernel module(s)
 
 Group:          System Environment/Kernel
 
 License:        IBM
 URL:            http://www.openafs.org
-Source0:        http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
+Source0:        http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{kmod_name}-%{version}%{pre}-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Upstream patches to build on kernel 3.5
-Patch0:         openafs-1.6.1-clear_inode.patch
-Patch1:         openafs-1.6.1-encode_fh.patch
-
-# Upstream patches to build on kernel 3.6. In-progress in Gerrit.
-# Steps to create these patches:
-# 1) git clone from openafs.org
-# 2) git checkout openafs-stable-1_6_1
-# 3) git checkout -b fedora
-# 4) Get the two Patches above (patch0 and patch1)
-#    git cherry-pick -x cc63cbbc138f60d6b5964fa859dcd778717b24c2
-#    git cherry-pick -x 407e7c90a97143d436ad3a6af6bbfa431c849191 
-# 5) Take note of the commit hash here.
-# 6) Cherry-pick the appropriate patches from Gerrit onto this "fedora" branch
-#    When cherry-picking "d_alias and i_dentry are now hlists"
-#    (http://gerrit.openafs.org/8080), avoid the post-1.6.1 canonical_dentry()
-#    function from http://gerrit.openafs.org/7951 .
-# 7) Create the patch files
-#     git format-patch <hash in step 5>
-#     If you forgot the hash from step 5, look with "git log --oneline"
-# 8) Rename patche files according to Fedora package guidelines:
-#     for i in $(ls *.patch); do mv $i openafs-1.6.1-$i; done
-
-# http://gerrit.openafs.org/8077
-Patch4: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
-# http://gerrit.openafs.org/8078
-Patch5: openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
-# http://gerrit.openafs.org/8079
-Patch6: openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
-# http://gerrit.openafs.org/8080
-Patch7: openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
-# http://gerrit.openafs.org/8081
-Patch8: openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
-# http://gerrit.openafs.org/8082
-Patch9: openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
-# http://gerrit.openafs.org/8083
-Patch10: openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
-# http://gerrit.openafs.org/8084
-Patch11: openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
 
 %global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
 BuildRequires: %{AkmodsBuildRequires}
@@ -96,24 +59,12 @@
 %setup -q -c -T -a 0
 
 # apply patches and do other stuff here
-pushd %{kmod_name}-%{version}
-# Kernel 3.5 patches
-%patch0 -p1
-%patch1 -p1
-# Kernel 3.6 patches
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+pushd %{kmod_name}-%{version}%{pre}
 ./regen.sh
 popd
 
 for kernel_version in %{?kernel_versions} ; do
-    cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+    cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
 done
 
 
@@ -147,50 +98,27 @@
 
 
 %changelog
-* Sat Jan 19 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.15
-- Rebuilt for updated kernel
-
-* Thu Jan 17 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.14
-- Rebuilt for updated kernel
+* Tue Jan 22 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-0.pre3
+- Update to OpenAFS 1.6.2 pre-release 3
 
-* Wed Jan 09 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.13
+* Thu Jan 17 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre2.4
 - Rebuilt for updated kernel
 
-* Sun Dec 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.12
+* Mon Jan 14 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre2.3
 - Rebuilt for updated kernel
 
-* Sat Dec 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.11
+* Sun Jan 13 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre2.2
 - Rebuilt for updated kernel
 
-* Tue Dec 18 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.10
-- Rebuilt for updated kernel
+* Thu Jan 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6.2-0.pre2.1
+- Rebuilt for f18 final kernel
 
-* Wed Dec 12 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.9
-- Rebuilt for updated kernel
+* Wed Dec 26 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-0.pre2
+- Update to OpenAFS 1.6.2 pre-release 2
 
-* Wed Dec 05 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.8
-- Rebuilt for updated kernel
-
-* Wed Nov 28 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.7
-- Rebuilt for updated kernel
-
-* Wed Nov 21 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.6
-- Rebuilt for updated kernel
-
-* Tue Nov 20 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.5
-- Rebuilt for updated kernel
-
-* Thu Nov 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.4
-- Rebuilt for updated kernel
-
-* Thu Nov 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.3
-- Rebuilt for updated kernel
-
-* Tue Oct 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.2
-- Rebuilt for updated kernel
-
-* Thu Oct 18 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.6.1-4.1
-- Rebuilt for updated kernel
+* Tue Dec 11 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
 
 * Sat Oct 06 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.1-4
 - Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels.


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Apr 2012 19:18:10 -0000	1.11
+++ sources	25 Jan 2013 09:09:41 -0000	1.12
@@ -1 +1 @@
-7215609990a2b253f8980fc1e1da0530  openafs-1.6.1-src.tar.bz2
+d4130bb529c26c2f0d232410f96004a4  openafs-1.6.2pre3-src.tar.bz2


--- openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch DELETED ---


--- openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch DELETED ---


--- openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch DELETED ---


--- openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch DELETED ---


--- openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch DELETED ---


--- openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch DELETED ---


--- openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch DELETED ---


--- openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch DELETED ---


--- openafs-1.6.1-clear_inode.patch DELETED ---


--- openafs-1.6.1-encode_fh.patch DELETED ---
