Accepting request 233659 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/233659
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=116

nfs-utils.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May  6 00:51:39 UTC 2014 - nfbrown@suse.com
+
+- nfsdcltrack_sbin.patch
+  The kernel expects nfsdcltrack to be in /sbin,
+  so we must put it there.
+
 -------------------------------------------------------------------
 Wed Apr 16 15:24:27 UTC 2014 - trenn@suse.de
 

nfs-utils.spec

@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           nfs-utils
 BuildRequires:  device-mapper-devel
 BuildRequires:  e2fsprogs-devel
@@ -89,6 +88,8 @@ Patch11:        gssd-mount-hang-fix.patch
 Patch12:        udp-fallback-fix.patch
 # PATCH-FIX-UPSTREAM fedfs-lib-name.patch nfbrown@suse.de
 Patch13:        fedfs-lib-name.patch
+# PATCH-FIX-UPSTREAM nfsdcltrack.sbin.patch nfbrown@suse.de
+Patch14:        nfsdcltrack.sbin.patch
 
 Suggests:       python-base
 
@@ -154,6 +155,7 @@ This package contains additional NFS documentation.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 cp %{S:6} .
 
 %build
@@ -332,7 +334,7 @@ fi
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
 /usr/sbin/rpc.svcgssd
-/usr/sbin/nfsdcltrack
+/sbin/nfsdcltrack
 %{_mandir}/man5/exports.5.gz
 %{_mandir}/man7/nfsd.7.gz
 %{_mandir}/man8/exportfs.8.gz

nfsdcltrack.sbin.patch

@@ -0,0 +1,16 @@
+---
+ utils/nfsdcltrack/Makefile.am |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- nfs-utils-1.2.8.orig/utils/nfsdcltrack/Makefile.am
++++ nfs-utils-1.2.8/utils/nfsdcltrack/Makefile.am
+@@ -1,5 +1,9 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++# These binaries go in /sbin (not /usr/sbin), and that cannot be
++# overridden at config time. The kernel "knows" the /sbin name.
++sbindir = /sbin
++
+ man8_MANS	= nfsdcltrack.man
+ EXTRA_DIST	= $(man8_MANS)
+