Author: ktdreyer Update of /cvs/free/rpms/openafs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv24887 Modified Files: .cvsignore openafs.spec sources Removed Files: openafs-1.6.0-xstat-cm-test.patch Log Message: * Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 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/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Dec 2011 23:15:11 -0000 1.4 +++ .cvsignore 8 Feb 2012 14:42:24 -0000 1.5 @@ -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/devel/openafs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- openafs.spec 16 Jan 2012 22:03:25 -0000 1.15 +++ openafs.spec 8 Feb 2012 14:42:24 -0000 1.16 @@ -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(a)ktdreyer.com&gt; 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(a)ktdreyer.com&gt; 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/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Dec 2011 23:15:11 -0000 1.7 +++ sources 8 Feb 2012 14:42:24 -0000 1.8 @@ -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-xstat-cm-test.patch DELETED ---