From edd6b5f5df8235c21a2be8c721990bc2723df992 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Sun, 1 Feb 2015 12:13:45 -0500 Subject: [PATCH] Updated to latest upstream release: 1-3-2 Signed-off-by: Steve Dickson --- .gitignore | 7 ++++--- nfs-utils.spec | 16 ++++++---------- sources | 1 + 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2f191db..7cf6261 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ x86_64 Makefile -/nfs-utils-1.2.8 -/nfs-utils-1.2.8.tar.bz2 -/nfs-utils-1.2.9.tar.bz2 /nfs-utils-1.3.0.tar.xz +nfs-utils-1.3.0/ /nfs-utils-1.3.1.tar.xz +nfs-utils-1.3.1/ +/nfs-utils-1.3.2.tar.xz +nfs-utils-1.3.2/ diff --git a/nfs-utils.spec b/nfs-utils.spec index d48fbf4..5dcdd38 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,8 +1,8 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.3.1 -Release: 6.0%{?dist} +Version: 1.3.2 +Release: 0.0%{?dist} Epoch: 1 # group all 32bit related archs @@ -15,8 +15,6 @@ Source2: nfs.sysconfig Source3: nfs-utils_env.sh Source4: lockd.conf -Patch001: nfs-utils-1.3.2.rc5.patch - Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch @@ -32,7 +30,6 @@ Provides: rpc.mountd = %{epoch}:%{version}-%{release} Provides: rpc.nfsd = %{epoch}:%{version}-%{release} Provides: rpc.statd = %{epoch}:%{version}-%{release} Provides: rpc.gssd = %{epoch}:%{version}-%{release} -Provides: rpc.svcgssd = %{epoch}:%{version}-%{release} Provides: mount.nfs = %{epoch}:%{version}-%{release} Provides: mount.nfs4 = %{epoch}:%{version}-%{release} Provides: umount.nfs = %{epoch}:%{version}-%{release} @@ -73,8 +70,6 @@ This package also contains the mount.nfs and umount.nfs program. %prep %setup -q -%patch001 -p1 - %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -146,7 +141,6 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf cd $RPM_BUILD_ROOT%{_unitdir} ln -s nfs-server.service nfs.service ln -s rpc-gssd.service nfs-secure.service -ln -s rpc-svcgssd.service nfs-secure-server.service ln -s nfs-idmapd.service nfs-idmap.service ln -s rpc-statd.service nfs-lock.service @@ -165,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT/* %pre # move files so the running service will have this applied as well -for x in gssd svcgssd idmapd ; do +for x in gssd idmapd ; do if [ -f /var/lock/subsys/rpc.$x ]; then mv /var/lock/subsys/rpc.$x /var/lock/subsys/rpc$x fi @@ -283,7 +277,6 @@ fi %{_sbindir}/showmount %{_sbindir}/rpc.idmapd %{_sbindir}/rpc.gssd -%{_sbindir}/rpc.svcgssd %{_sbindir}/sm-notify %{_sbindir}/start-statd %{_sbindir}/mountstats @@ -300,6 +293,9 @@ fi /sbin/umount.nfs4 %changelog +* Sat Jan 31 015 Steve Dickson 1.3.2-0.0 +- Updated to latest upstream release: 1-3-2 + * Mon Jan 19 2015 Steve Dickson 1.3.1-6.0 - Set the GSS_USE_PROXY variable in nfs-utils_env.sh (bz 1183787) diff --git a/sources b/sources index 1627ef5..05716c6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8de676b9ff34b8f9addc1d0800fabdf8 nfs-utils-1.3.1.tar.xz +4cdffb2c7f7fd2bdceaba55ab1b881da nfs-utils-1.3.2.tar.xz