diff --git a/nfs-utils.spec b/nfs-utils.spec index 5ab88c0e7eed45c5ae9b398d64bae8c801a26606..9d48f62d801e273bbb6df6867f87eec710bd07bc 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -4,7 +4,7 @@ Name: nfs-utils Version: 2.5.4 -Release: 2 +Release: 3 Epoch: 1 Summary: The Linux NFS userland utility package License: MIT and GPLv2 and GPLv2+ and BSD @@ -25,7 +25,8 @@ BuildRequires: systemd, pkgconfig, rpcgen Requires: rpcbind, sed, gawk, grep, kmod, keyutils, quota -Requires: libevent libblkid libcap libmount +Requires: libevent libblkid libcap libmount libnfsidmap + Requires: libtirpc >= 0.2.3-1 gssproxy => 0.7.0-3 Recommends: %{name}-help = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils >= 4.0.3-25 @@ -37,8 +38,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires(postun): glibc -Requires: openldap - Provides: exportfs = %{epoch}:%{version}-%{release} Provides: nfsstat = %{epoch}:%{version}-%{release} @@ -55,10 +54,6 @@ Provides: umount.nfs = %{epoch}:%{version}-%{release} Provides: umount.nfs4 = %{epoch}:%{version}-%{release} Provides: sm-notify = %{epoch}:%{version}-%{release} Provides: start-statd = %{epoch}:%{version}-%{release} -Provides: libnfsidmap = %{epoch}:%{version}-%{release} -Provides: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: libnfsidmap - %description This is he nfs-utils tools package. @@ -76,6 +71,34 @@ Obsoletes: libnfsidmap-devel This contains dynamic libraries and header files for the developing of the libnfsidmap library. +%package -n libnfsidmap +Summary: NFSv4 User and Group ID Mapping Library +Provides: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release} +License: BSD +BuildRequires: pkgconfig, openldap-devel +BuildRequires: automake, libtool +Requires: openldap + +%description -n libnfsidmap +Library that handles mapping between names and ids for NFSv4. + +%package -n nfs-utils-nestos +Summary: Minimal NFS utilities for supporting clients +Provides: nfsstat = %{epoch}:%{version}-%{release} +Provides: rpc.statd = %{epoch}:%{version}-%{release} +Provides: rpc.gssd = %{epoch}:%{version}-%{release} +Provides: mount.nfs = %{epoch}:%{version}-%{release} +Provides: mount.nfs4 = %{epoch}:%{version}-%{release} +Provides: umount.nfs = %{epoch}:%{version}-%{release} +Provides: umount.nfs4 = %{epoch}:%{version}-%{release} +Provides: start-statd = %{epoch}:%{version}-%{release} +Provides: nfsidmap = %{epoch}:%{version}-%{release} +Provides: showmount = %{epoch}:%{version}-%{release} +Requires: rpcbind +%{?systemd_requires} + +%description -n nfs-utils-nestos +Minimal NFS utilities for supporting clients %package help Summary: Including man files for nfs-utils @@ -193,12 +216,11 @@ fi %files -%doc support/nfsidmap/AUTHORS linux-nfs/README linux-nfs/THANKS +%doc linux-nfs/README linux-nfs/THANKS %license support/nfsidmap/COPYING %config(noreplace) /etc/nfsmount.conf %config(noreplace) %{_sharedstatedir}/nfs/etab %config(noreplace) %{_sharedstatedir}/nfs/rmtab -%config(noreplace) %{_sysconfdir}/idmapd.conf %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf %config(noreplace) %{_sysconfdir}/nfs.conf %dir %{_sysconfdir}/exports.d @@ -213,8 +235,6 @@ fi /sbin/{rpc.statd,nfsdcltrack,osd_login,mount.nfs4,umount.*,nfsdcld} %{_sbindir}/* %{_prefix}/lib/systemd/*/* -%{_libdir}/libnfsidmap.so.* -%{_libdir}/libnfsidmap/*.so %files devel %{_includedir}/nfsidmap.h @@ -222,10 +242,48 @@ fi %{_libdir}/pkgconfig/libnfsidmap.pc %{_libdir}/libnfsidmap.so +%files -n nfs-utils-nestos +%dir %attr(555, root, root) %{_sharedstatedir}/nfs/rpc_pipefs +%dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd +%dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm +%dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm.bak +%ghost %attr(644,rpcuser,rpcuser) %{_statdpath}/state +%config(noreplace) %{_sysconfdir}/nfsmount.conf +%config(noreplace) %{_sysconfdir}/nfs.conf +%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf +%{_sbindir}/nfsidmap +%{_sbindir}/nfsstat +%{_sbindir}/rpc.gssd +%{_sbindir}/start-statd +%{_sbindir}/showmount +%attr(4755,root,root) /sbin/mount.nfs +/sbin/mount.nfs4 +/sbin/rpc.statd +/sbin/umount.nfs +/sbin/umount.nfs4 + +%{_prefix}/lib/systemd/*/rpc-pipefs-generator +%{_prefix}/lib/systemd/*/auth-rpcgss-module.service +%{_prefix}/lib/systemd/*/nfs-client.target +%{_prefix}/lib/systemd/*/rpc-gssd.service +%{_prefix}/lib/systemd/*/rpc-statd.service +%{_prefix}/lib/systemd/*/rpc_pipefs.target +%{_prefix}/lib/systemd/*/var-lib-nfs-rpc_pipefs.mount + +%files -n libnfsidmap +%doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING +%config(noreplace) %{_sysconfdir}/idmapd.conf +%{_libdir}/libnfsidmap.so.* +%{_libdir}/libnfsidmap/*.so +%{_mandir}/man3/nfs4_uid_to_name.* + %files help %{_mandir}/*/* %changelog +* Thu Feb 17 2022 fushanqing - 2.5.4-3 +- add subpackage libnfsidmap and nfs-utils-nestos + * Sat Jan 29 2022 Zhiqiang Liu - 2.5.4-2 - In order to be consistent with the old versions, here we set use-gss-proxy to true in nfs.conf.