From 624abd876d3a110bc3e09b37d9bd4fff705f6658 Mon Sep 17 00:00:00 2001
From: Alice Mitchell <ajmitchell@redhat.com>
Date: Tue, 24 Aug 2021 10:43:14 +0100
Subject: [PATCH] Explicitly disable the removed nfs-convert service Resolves:
 bz1937811

---
 nfs-utils.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 95f64f2..debe5bd 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: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -298,6 +298,9 @@ fi
 %triggerin -- nfs-utils > 1:2.1.1-3
 /bin/systemctl try-restart gssproxy || :
 
+%triggerun -- nfs-utils < 2.5.4-3
+/bin/systemctl disable nfs-convert >/dev/null 2>&1 || :
+
 %files
 %config(noreplace) /etc/nfsmount.conf
 %dir %{_sysconfdir}/exports.d
@@ -442,6 +445,9 @@ fi
 %{_mandir}/*/nfsiostat.8.gz
 
 %changelog
+* Tue Aug 24 2021 Alice Mitchell <ajmitchell@redhat.com> 2.5.4-4
+- explicitly disable any previous nfs-convert (bz 1937811)
+
 * Fri Aug 20 2021 Steve Dickson <steved@redhat.com> 2.5.4-3
 - mount.nfs: insert 'sloppy' at beginning of the options (bz 1987070)
 - spec: Fix dependency problems with nfsdclnts (bz 1924708)