From 51c6023fa1570b150d2168224e8e87a01ef3500c Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:37:49 +0100
Subject: [PATCH] move nfsdcld to serve package; install nfs.conf; create
 /var/lib/nfs/nfsdcld; add debug package [release 2.4.3-2mamba;Sat Apr 11
 2020]

---
 nfs-utils.spec | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index ca208d3..ee330b0 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -9,7 +9,7 @@
 
 Name:          nfs-utils
 Version:       2.4.3
-Release:       1mamba
+Release:       2mamba
 Summary:       NFS utilities and supporting clients and daemons for the kernel NFS server
 Group:         Network/File Systems
 Vendor:        openmamba
@@ -85,6 +85,8 @@ Summary:       Development files for libnfsidmap
 libnfsidmap is a library holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4.
 This package contains the files needed for development with this library.
 
+%debug_package
+
 %prep
 %setup -q
 #%ifarch arm
@@ -150,6 +152,7 @@ make all CC=%{_host}-gcc CFLAGS="%{optflags}" LDFLAGS="-lrpcsecgss" \
 install -d %{buildroot}/var/lib/nfs/rpc_pipefs
 install -d %{buildroot}/var/lib/nfs/statd
 install -d %{buildroot}/var/lib/nfs/v4recovery
+install -d %{buildroot}/var/lib/nfs/nfsdcld
 install -d %{buildroot}/var/lib/nfs/nfsdcltrack
 touch %{buildroot}/var/lib/nfs/rmtab
 
@@ -162,12 +165,14 @@ touch %{buildroot}%{_sysconfdir}/exports
 #cp -a systemd/*.mount %{buildroot}%{_unitdir}
 #rm -f %{buildroot}%{_unitdir}/nfs-idmapd.service
 
-install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/nfs
+#install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/nfs
 
 install -D -m0755 %{SOURCE2} %{buildroot}%{_prefix}/libexec/nfs-utils/nfs-utils_env.sh
 
 install -D -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/idmapd.conf
 
+install -D -m0644 nfs.conf %{buildroot}%{_sysconfdir}/nfs.conf
+
 %pre
 if [ $1 -ge 1 ]; then
    chkconfig nfs off 2>/dev/null || true
@@ -213,19 +218,14 @@ fi
 
 %files
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/sysconfig/nfs
+%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
 %endif
-/sbin/nfsdcltrack
-%ifarch x86_64
-%{_sbindir}/clddb-tool
-%{_sbindir}/nfsdcld
-%{_unitdir}/nfsdcld.service
-%endif
 %{_sbindir}/blkmapd
 %{_sbindir}/mountstats
 %{_sbindir}/nfsconf
@@ -261,7 +261,6 @@ fi
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs/sm
 %dir /var/lib/nfs/sm.bak
-%dir /var/lib/nfs/nfsdcltrack
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
@@ -301,6 +300,12 @@ fi
 %{_sbindir}/exportfs
 %{_sbindir}/rpc.mountd
 %{_sbindir}/rpc.nfsd
+/sbin/nfsdcltrack
+%ifarch x86_64
+%{_sbindir}/clddb-tool
+%{_sbindir}/nfsdcld
+%{_unitdir}/nfsdcld.service
+%endif
 %{_unitdir}/auth-rpcgss-module.service
 %{_unitdir}/nfs-server.service
 %{_unitdir}/proc-fs-nfsd.mount
@@ -308,6 +313,8 @@ fi
 %{_unitdir}/var-lib-nfs-rpc_pipefs.mount
 %{_systemdgeneratordir}/nfs-server-generator
 %{_systemdgeneratordir}/rpc-pipefs-generator
+%dir /var/lib/nfs/nfsdcltrack
+%dir /var/lib/nfs/nfsdcld
 %{_mandir}/man3/nfs4_uid_to_name.3*
 %{_mandir}/man5/exports.5*
 %{_mandir}/man5/idmapd.conf.5*
@@ -342,6 +349,9 @@ fi
 
 
 %changelog
+* Sat Apr 11 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.3-2mamba
+- move nfsdcld to serve package; install nfs.conf; create /var/lib/nfs/nfsdcld; add debug package
+
 * Fri Feb 14 2020 Automatic Build System <autodist@mambasoft.it> 2.4.3-1mamba
 - automatic version update by autodist