From 24ada8ada9558ad8742cb29cd47b043d4eeedce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 9 Apr 2024 22:24:45 +0200
Subject: [PATCH] Move binaries to %{_sbindir}, adjust paths for merged-sbin

This is in preparation for
https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin and
implements https://pagure.io/packaging-committee/pull-request/1355.
Since %{_sbindir} will point to /usr/bin, files are moved first
to /usr/sbin, but then when the merge is implemented, to /usr/bin.

After sbin is merged, filesystem.rpm will have a filetrigger to
provide a symlink from /usr/sbin/ to /usr/bin on unmerged systems, so
then all possible paths will work: /bin/foo, /sbin/foo,
/usr/bin/foo, and /usr/sbin/foo.

This can be merged immediately after
https://pagure.io/packaging-committee/pull-request/1355 is approved.
---
 nfs-utils.spec | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index fa6342625f..9ea0ca24df 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -164,9 +164,6 @@ sh -x autogen.sh
 %install
 %global _pkgdir %{_prefix}/lib/systemd
 
-rm -rf $RPM_BUILD_ROOT/*
-
-mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
 mkdir -p $RPM_BUILD_ROOT%{_pkgdir}/system
@@ -194,7 +191,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.{a,la}
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
 
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rmtab
-mv $RPM_BUILD_ROOT%{_sbindir}/rpc.statd $RPM_BUILD_ROOT/sbin
 
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak
@@ -298,8 +294,8 @@ rm -rf /etc/systemd/system/rpc-*.requires
 
 %doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
 %doc linux-nfs/THANKS linux-nfs/TODO
-/sbin/rpc.statd
-/sbin/nfsdcltrack
+%{_sbindir}/rpc.statd
+%{_sbindir}/nfsdcltrack
 %{_sbindir}/exportfs
 %{_sbindir}/nfsstat
 %{_sbindir}/rpcdebug
@@ -326,11 +322,11 @@ rm -rf /etc/systemd/system/rpc-*.requires
 %{_mandir}/*/*
 %{_pkgdir}/*/*
 
-%attr(4755,root,root)	/sbin/mount.nfs
+%attr(4755,root,root) %{_sbindir}/mount.nfs
 
-/sbin/mount.nfs4
-/sbin/umount.nfs
-/sbin/umount.nfs4
+%{_sbindir}/mount.nfs4
+%{_sbindir}/umount.nfs
+%{_sbindir}/umount.nfs4
 
 %files -n libnfsidmap
 %doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
@@ -359,11 +355,11 @@ rm -rf /etc/systemd/system/rpc-*.requires
 %{_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
+%attr(4755,root,root) %{_sbindir}/mount.nfs
+%{_sbindir}/mount.nfs4
+%{_sbindir}/rpc.statd
+%{_sbindir}/umount.nfs
+%{_sbindir}/umount.nfs4
 %{_mandir}/*/nfs.5.gz
 %{_mandir}/*/nfs.conf.5.gz
 %{_mandir}/*/nfsmount.conf.5.gz
@@ -401,10 +397,10 @@ rm -rf /etc/systemd/system/rpc-*.requires
 %{_sbindir}/nfsstat
 %{_libexecdir}/nfsrahead
 %{_udevrulesdir}/99-nfs.rules
-%attr(4755,root,root) /sbin/mount.nfs
-/sbin/mount.nfs4
-/sbin/umount.nfs
-/sbin/umount.nfs4
+%attr(4755,root,root) %{_sbindir}/mount.nfs
+%{_sbindir}/mount.nfs4
+%{_sbindir}/umount.nfs
+%{_sbindir}/umount.nfs4
 %{_mandir}/*/nfs.5.gz
 %{_mandir}/*/nfs.conf.5.gz
 %{_mandir}/*/nfsmount.conf.5.gz
-- 
2.44.0