Author: ktdreyer Update of /cvs/free/rpms/openafs/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15818 Modified Files: openafs.spec sources Removed Files: openafs-1.6.1-afsd-sys-resource-h.patch openafs-1.6.1-int31-partsize.patch Log Message: * Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.2-0.pre1 - Update to OpenAFS 1.6.2 pre-release 1 - Remove upstreamed patches Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/F-18/openafs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- openafs.spec 12 Dec 2012 05:12:29 -0000 1.30 +++ openafs.spec 13 Dec 2012 20:13:13 -0000 1.31 @@ -10,15 +10,17 @@ %define sysname amd64_linux26 %endif +%define pre pre1 + Summary: Enterprise Network File System Name: openafs -Version: 1.6.1 -Release: 9%{?dist} +Version: 1.6.2 +Release: 0.%{pre}%{?dist} License: IBM Group: System Environment/Daemons URL: http://www.openafs.org -Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2 -Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2 +Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p... +Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p... Source11: http://grand.central.org/dl/cellservdb/CellServDB Source12: cacheinfo Source13: openafs.init @@ -36,22 +38,16 @@ BuildRequires: automake, autoconf Patch0: openafs-1.6.0-fPIC.patch -# Upstream patch to fix fileservers with >2TB partitions -Patch1: openafs-1.6.1-int31-partsize.patch -# Upstream patch to compile with newer glibc -# (not yet on openafs-stable-1_6_x; cherry-picked from master) -Patch2: openafs-1.6.1-afsd-sys-resource-h.patch # systemd: Skip CellServDB manipulation -Patch3: openafs-1.6.1-systemd-no-cellservdb.patch +Patch1: openafs-1.6.1-systemd-no-cellservdb.patch # systemd: unload the proper kernel module -# (TODO: check if this can be upstreamed) -Patch4: openafs-1.6.1-systemd-kmod-name.patch +Patch2: openafs-1.6.1-systemd-kmod-name.patch # systemd: use FHS-style paths instead of transarc paths -Patch5: openafs-1.6.1-systemd-fhs.patch +Patch3: openafs-1.6.1-systemd-fhs.patch # systemd: add additional user-friendly environment vars -Patch6: openafs-1.6.1-systemd-env-vars.patch +Patch4: openafs-1.6.1-systemd-env-vars.patch # Add ExecPostStart "sysnames" helper script. -Patch7: openafs-1.6.1-systemd-execpoststart.patch +Patch5: openafs-1.6.1-systemd-execpoststart.patch # Use systemd unit files on Fedora 18 and above. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -132,24 +128,17 @@ Cell. %prep -%setup -q -b 1 -n openafs-%{version} +%setup -q -b 1 -n openafs-%{version}%{pre} # This changes osconf.m4 to build with -fPIC on i386 and x86_64 %patch0 -# This allows fileservers to report correct partition usage on -# partitions greater than 2TB. -%patch1 -p1 - -# This allows us to build with newer glibc -%patch2 -p1 - # systemd unit file changes for RPM Fusion -%patch3 -p1 -b .cellservdb -%patch4 -p1 -b .kmod -%patch5 -p1 -b .fhs -%patch6 -p1 -b .envvars -%patch7 -p1 -b .execpoststart +%patch1 -p1 -b .cellservdb +%patch2 -p1 -b .kmod +%patch3 -p1 -b .fhs +%patch4 -p1 -b .envvars +%patch5 -p1 -b .execpoststart # Convert the licese to UTF-8 mv src/LICENSE src/LICENSE~ @@ -465,6 +454,10 @@ %{_datadir}/openafs/C/afszcm.cat %changelog +* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.2-0.pre1 +- Update to OpenAFS 1.6.2 pre-release 1 +- Remove upstreamed patches + * Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-9 - Correct bosserver path in systemd unit file Index: sources =================================================================== RCS file: /cvs/free/rpms/openafs/F-18/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Apr 2012 18:10:38 -0000 1.11 +++ sources 13 Dec 2012 20:13:13 -0000 1.12 @@ -1,2 +1,2 @@ -7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2 -73d9a86038e827f95de90cf56c940bf7 openafs-1.6.1-doc.tar.bz2 +5d77189a51e3b91783ac52eb0748e739 openafs-1.6.2pre1-src.tar.bz2 +e05267e5e0b67c86baf11b35860fc8ff openafs-1.6.2pre1-doc.tar.bz2 --- openafs-1.6.1-afsd-sys-resource-h.patch DELETED --- --- openafs-1.6.1-int31-partsize.patch DELETED ---