From 9778877f7d2e26218034d72fc1bdc02436c7e73e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:37:51 +0100
Subject: [PATCH] removed Requires(pre): /sbin/nologin; rebuilt in /usr
 [release 2.5.4-2mamba;Thu Aug 05 2021]

---
 nfs-utils.spec | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index f796b40..79f0bf3 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -9,7 +9,7 @@
 
 Name:          nfs-utils
 Version:       2.5.4
-Release:       1mamba
+Release:       2mamba
 Summary:       NFS utilities and supporting clients and daemons for the kernel NFS server
 Group:         Network/File Systems
 Vendor:        openmamba
@@ -49,9 +49,9 @@ BuildRequires: libz-devel
 #%endif
 BuildRequires: rpcsvc-proto-devel
 BuildRequires: pkgconfig
-# build  libraries needed to support nfsv4
+# build libraries needed to support nfsv4
 #BuildRequires: tcp_wrappers-devel >= 7.6
-Requires(pre): /sbin/nologin
+#Requires(pre): /sbin/nologin
 Requires:      rpcbind
 Requires:      libnfsidmap = %{?epoch:%epoch:}%{version}-%{release}
 %systemd_requires
@@ -145,7 +145,10 @@ make all CC=%{_host}-gcc CFLAGS="%{optflags}" \
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%makeinstall statduser=$USER generator_dir=%{_systemdgeneratordir}
+%makeinstall \
+   sbindir=%{_sbindir} \
+   statduser=$USER \
+   generator_dir=%{_systemdgeneratordir}
 
 install -d %{buildroot}/var/lib/nfs/rpc_pipefs
 install -d %{buildroot}/var/lib/nfs/statd
@@ -173,9 +176,6 @@ install -D -m0644 nfs.conf %{buildroot}%{_sysconfdir}/nfs.conf
 
 %pre
 if [ $1 -ge 1 ]; then
-   chkconfig nfs off 2>/dev/null || true
-   rm -f  /etc/rc*.d/S55nfs
-   chkconfig nfslock off 2>/dev/null || true
    /usr/sbin/groupadd -g %{rpcuser_gid} rpcuser 2>/dev/null
    /usr/sbin/useradd -c "RPC Service User" \
       -s /bin/false -u %{rpcuser_uid} -g rpcuser -d /var/lib/nfs rpcuser 2>/dev/null
@@ -219,10 +219,10 @@ fi
 %config(noreplace) %{_sysconfdir}/nfs.conf
 #%config(noreplace) %{_sysconfdir}/sysconfig/nfs
 %if %{with_mount}
-%attr(4755,root,root) /sbin/mount.nfs
-/sbin/mount.nfs4
-/sbin/umount.nfs
-/sbin/umount.nfs4
+%attr(4755,root,root) %{_sbindir}/mount.nfs
+%{_sbindir}/mount.nfs4
+%{_sbindir}/umount.nfs
+%{_sbindir}/umount.nfs4
 %endif
 %{_sbindir}/blkmapd
 %{_sbindir}/mountstats
@@ -295,7 +295,7 @@ fi
 %{_sbindir}/rpc.mountd
 %{_sbindir}/rpc.nfsd
 %{_sbindir}/nfsdclnts
-/sbin/nfsdcltrack
+%{_sbindir}/nfsdcltrack
 %ifarch x86_64
 %{_sbindir}/nfsdclddb
 %{_sbindir}/nfsdcld
@@ -351,6 +351,9 @@ fi
 
 
 %changelog
+* Thu Aug 05 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.4-2mamba
+- removed Requires(pre): /sbin/nologin; rebuilt in /usr
+
 * Sat Jun 19 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.4-1mamba
 - update to 2.5.4