From 0cf132f10c00257c0077614ac792a86e8f5d05e9 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 16 Aug 2021 13:28:07 -0400
Subject: [PATCH] Remove nfsconvert command (bz 1937811)

Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: bz1937811
---
 nfs-utils.spec | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index e34e5be..1ccf4f6 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -12,10 +12,7 @@ Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{v
 Source1: id_resolver.conf
 Source2: lockd.conf
 Source3: 24-nfs-server.conf
-Source4: nfsconvert.py
-Source5: nfsconvert.sh
-Source6: nfs-convert.service
-Source7: 10-nfsv4.conf
+Source4: 10-nfsv4.conf
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -188,9 +185,6 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
 mkdir -p $RPM_BUILD_ROOT/run/sysconfig
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/nfsconvert
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/%{_libexecdir}/nfs-utils/nfsconvert.sh
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pkgdir}/system
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.{a,la}
@@ -206,7 +200,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/v4recovery
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
 
 
 %pre
@@ -260,10 +254,6 @@ if [ $1 -eq 1 ] ; then
 	/bin/systemctl start nfs-client.target  >/dev/null 2>&1 || :
 fi
 
-# Enable nfs-convert so if an old configuration
-# exists a conversion will occur
-/bin/systemctl enable nfs-convert  >/dev/null 2>&1 || :
-
 %systemd_post nfs-server
 
 %post -n nfsv4-client-utils
@@ -339,7 +329,6 @@ fi
 %{_sbindir}/blkmapd
 %{_sbindir}/nfsconf
 %{_sbindir}/nfsref
-%{_sbindir}/nfsconvert
 %{_sbindir}/nfsdcld
 %{_sbindir}/nfsdclddb
 %{_sbindir}/nfsdclnts
@@ -347,7 +336,6 @@ fi
 %{_pkgdir}/*/*
 
 %attr(4755,root,root)	/sbin/mount.nfs
-%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
 
 /sbin/mount.nfs4
 /sbin/umount.nfs
@@ -417,9 +405,7 @@ fi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/nfsmount.conf.d/10-nfsv4.conf
 %{_sbindir}/rpc.gssd
 %{_sbindir}/nfsidmap
-%{_sbindir}/nfsconvert
 %{_sbindir}/nfsstat
-%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
 %attr(4755,root,root) /sbin/mount.nfs
 /sbin/mount.nfs4
 /sbin/umount.nfs
@@ -439,7 +425,6 @@ fi
 %{_pkgdir}/*/rpc-pipefs-generator
 %{_pkgdir}/*/auth-rpcgss-module.service
 %{_pkgdir}/*/nfs-client.target
-%{_pkgdir}/*/nfs-convert.service
 %{_pkgdir}/*/rpc-gssd.service
 %{_pkgdir}/*/rpc_pipefs.target
 %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
@@ -451,6 +436,9 @@ fi
 %{_mandir}/*/nfsiostat.8.gz
 
 %changelog
+* Mon Aug 16 2021 Steve Dickson <steved@redhat.com> 2.5.4-2
+- Remove nfsconvert command (bz 1937811)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.5.4-1
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688