rpms/openafs/F-15 .cvsignore, 1.6, 1.7 openafs.spec, 1.18, 1.19 sources, 1.9, 1.10 openafs-1.6.0-setserverprefs.patch, 1.1, NONE openafs-1.6.0-xstat-cm-test.patch, 1.1, NONE

[Ken Dreyer]

Author: ktdreyer

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

Modified Files:
	.cvsignore openafs.spec sources 
Removed Files:
	openafs-1.6.0-setserverprefs.patch 
	openafs-1.6.0-xstat-cm-test.patch 
Log Message:
* Wed Feb 08 2012 Ken Dreyer <ktdreyer at ktdreyer.com> 0:1.6.1-0.pre2
- Update to OpenAFS 1.6.1 pre-release 2
- Drop setserverprefs patch (merged in http://gerrit.openafs.org/5566)
- Drop xstat_cm_test patch (merged in http://gerrit.openafs.org/6386)



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2012 23:50:41 -0000	1.6
+++ .cvsignore	10 Feb 2012 20:59:34 -0000	1.7
@@ -1,2 +1,2 @@
-openafs-1.6.1pre1-src.tar.bz2
-openafs-1.6.1pre1-doc.tar.bz2
+openafs-1.6.1pre2-src.tar.bz2
+openafs-1.6.1pre2-doc.tar.bz2


Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/openafs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openafs.spec	16 Jan 2012 22:13:49 -0000	1.18
+++ openafs.spec	10 Feb 2012 20:59:34 -0000	1.19
@@ -10,12 +10,12 @@
 %define sysname amd64_linux26
 %endif
 
-%define pre pre1
+%define pre pre2
 
 Summary:        Enterprise Network File System
 Name:           openafs
 Version:        1.6.1
-Release:        0.%{pre}.1%{?dist}
+Release:        0.%{pre}%{?dist}
 License:        IBM
 Group:          System Environment/Daemons
 URL:            http://www.openafs.org
@@ -32,10 +32,6 @@
 
 Patch0:		openafs-1.6.0-fPIC.patch
 
-# Already merged in master, awaiting 1.6.
-Patch1:		openafs-1.6.0-setserverprefs.patch
-Patch2:		openafs-1.6.0-xstat-cm-test.patch
-
 %description
 The AFS distributed filesystem.  AFS is a distributed filesystem
 allowing cross-platform sharing of files among multiple computers.
@@ -101,8 +97,6 @@
 # This changes osconf.m4 to build with -fPIC on i386 and x86_64
 %patch0
 
-# These patches are already merged in master.
-
 # Convert the licese to UTF-8
 mv src/LICENSE src/LICENSE~
 iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -327,6 +321,11 @@
 %{_datadir}/openafs/C/afszcm.cat
 
 %changelog
+* Wed Feb 08 2012 Ken Dreyer <ktdreyer at ktdreyer.com> 0:1.6.1-0.pre2
+- Update to OpenAFS 1.6.1 pre-release 2
+- Drop setserverprefs patch (merged in http://gerrit.openafs.org/5566)
+- Drop xstat_cm_test patch (merged in http://gerrit.openafs.org/6386)
+
 * Mon Jan 16 2012 Ken Dreyer <ktdreyer at ktdreyer.com> 0:1.6.1-0.pre1.1
 - Log an error if we couldn't load the kernel module (RF BZ #2006)
 - Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Jan 2012 23:50:41 -0000	1.9
+++ sources	10 Feb 2012 20:59:34 -0000	1.10
@@ -1,2 +1,2 @@
-99a79608d68a7f087a1357d2f3ad2b01  openafs-1.6.1pre1-src.tar.bz2
-be0f3db9d12603684126c56a3aa4c613  openafs-1.6.1pre1-doc.tar.bz2
+9715d40c4226d2bc119f139392b2f57b  openafs-1.6.1pre2-src.tar.bz2
+ecea0ca0c1669c2885f34cd7b2a1c4e2  openafs-1.6.1pre2-doc.tar.bz2


--- openafs-1.6.0-setserverprefs.patch DELETED ---


--- openafs-1.6.0-xstat-cm-test.patch DELETED ---