From ccf30269e50c3555f7eb75a9813f3616a8e4ad24 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@mambasoft.it>
Date: Sat, 6 Jan 2024 07:37:49 +0100
Subject: [PATCH] automatic version update by autodist [release
 2.3.3-1mamba;Tue Apr 23 2019]

---
 nfs-utils.spec | 67 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d5897ac..d7598b9 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -8,8 +8,8 @@
 %define with_mount     1
 
 Name:          nfs-utils
-Version:       1.3.4
-Release:       2mamba
+Version:       2.3.3
+Release:       1mamba
 Summary:       NFS utilities and supporting clients and daemons for the kernel NFS server
 Group:         Network/File Systems
 Vendor:        openmamba
@@ -52,6 +52,7 @@ BuildRequires: pkgconfig
 #BuildRequires: tcp_wrappers-devel >= 7.6
 Requires(pre): /sbin/nologin
 Requires:      rpcbind
+Requires:      libnfsidmap = %{?epoch:%epoch:}%{version}-%{release}
 %systemd_requires
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -67,9 +68,24 @@ Requires(post):%{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description -n nfs-server
 This package contains libraries and header files for developing applications that use %{name}.
 
+%package -n libnfsidmap
+Group:         System/Libraries
+Summary:       A NFS library holding mulitiple methods of mapping names to id's and visa versa
+
+%description -n libnfsidmap
+libnfsidmap is a library holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4.
+
+%package -n libnfsidmap-devel
+Group:         Development/Libraries
+Summary:       Development files for libnfsidmap
+
+%description -n libnfsidmap-devel
+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.
+
 %prep
 %setup -q
-%patch1 -p1
+#% patch1 -p1
 sed -i "s|/run/sysconfig|/run|" systemd/*
 
 %build
@@ -110,7 +126,8 @@ sed -i "s|/run/sysconfig|/run|" systemd/*
 #  --enable-nfsv3 \
 #  --enable-secure-statd
 
-make all CC=%{_host}-gcc CFLAGS="%{optflags}" LDFLAGS="-lrpcsecgss"
+make all CC=%{_host}-gcc CFLAGS="%{optflags}" LDFLAGS="-lrpcsecgss" \
+  generator_dir=%{_systemdgeneratordir}
 #%if "%{_host}" != "%{_build}"
 #   LDFLAGS="-L%{_prefix}/%{_host}/lib -lnsl -ldl -luuid -l"
 #%endif
@@ -118,7 +135,7 @@ make all CC=%{_host}-gcc CFLAGS="%{optflags}" LDFLAGS="-lrpcsecgss"
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%makeinstall statduser=$USER
+%makeinstall statduser=$USER generator_dir=%{_systemdgeneratordir}
 
 install -d %{buildroot}/var/lib/nfs/rpc_pipefs
 install -d %{buildroot}/var/lib/nfs/statd
@@ -194,6 +211,7 @@ fi
 /sbin/osd_login
 %{_sbindir}/blkmapd
 %{_sbindir}/mountstats
+%{_sbindir}/nfsconf
 %{_sbindir}/nfsidmap
 %{_sbindir}/nfsiostat
 %{_sbindir}/nfsstat
@@ -211,7 +229,7 @@ fi
 %{_sbindir}/sm-notify
 %{_sbindir}/start-statd
 %{_unitdir}/nfs-client.target
-%{_unitdir}/nfs-config.service
+#%{_unitdir}/nfs-config.service
 %{_unitdir}/rpc-statd.service
 %{_unitdir}/nfs-utils.service
 %{_unitdir}/nfs-blkmap.service
@@ -229,7 +247,7 @@ fi
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
-%config(noreplace) /var/lib/nfs/xtab
+#%config(noreplace) /var/lib/nfs/xtab
 %{_mandir}/man5/nfs.5*
 %{_mandir}/man5/nfsmount.conf.5*
 %{_mandir}/man8/blkmapd.8*
@@ -261,21 +279,48 @@ fi
 %{_sbindir}/rpc.mountd
 %{_sbindir}/rpc.nfsd
 %{_unitdir}/auth-rpcgss-module.service
-#%{_unitdir}/nfs-blkmap.target
 %{_unitdir}/nfs-server.service
 %{_unitdir}/proc-fs-nfsd.mount
-#%{_unitdir}/rpc-svcgssd.service
+%{_unitdir}/rpc_pipefs.target
 %{_unitdir}/var-lib-nfs-rpc_pipefs.mount
+%{_systemdgeneratordir}/nfs-server-generator
+%{_systemdgeneratordir}/rpc-pipefs-generator
+%{_mandir}/man3/nfs4_uid_to_name.3*
 %{_mandir}/man5/exports.5*
+%{_mandir}/man5/idmapd.conf.5*
+%{_mandir}/man5/nfs.conf.5*
+%{_mandir}/man7/nfsd.7*
+%{_mandir}/man7/nfs.systemd.7*
 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
-#%{_mandir}/man8/rpc.svcgssd.8*
-%{_mandir}/man7/nfsd.7*
+%{_mandir}/man8/nfsconf.8*
+
+%files -n libnfsidmap
+%defattr(-,root,root)
+%{_libdir}/libnfsidmap.so.*
+%{_libdir}/libnfsidmap/nsswitch.la
+%{_libdir}/libnfsidmap/nsswitch.so
+%{_libdir}/libnfsidmap/static.la
+%{_libdir}/libnfsidmap/static.so
+%{_libdir}/libnfsidmap/umich_ldap.la
+%{_libdir}/libnfsidmap/umich_ldap.so
+
+%files -n libnfsidmap-devel
+%defattr(-,root,root)
+%{_includedir}/nfsidmap.h
+%{_includedir}/nfsidmap_plugin.h
+%{_libdir}/libnfsidmap.la
+%{_libdir}/libnfsidmap.so
+%{_libdir}/pkgconfig/libnfsidmap.pc
+
 
 %changelog
+* Tue Apr 23 2019 Automatic Build System <autodist@mambasoft.it> 2.3.3-1mamba
+- automatic version update by autodist
+
 * Sun Oct 30 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.4-2mamba
 - correctly provide nfs-utils_env.sh