Move remaining binaries from /sbin to /usr/sbin
mount.nfs, mount.nfs4, umount.nfs, umount.nfs4, nfsdcltrack, and rpc.statd are all still being installed in /sbin. Current best practices say that packages should not package anything directly in /sbin but rather /usr/sbin. The configure script in nfs-utils has the --disable-sbin-override for this purpose. Note that on RHEL /sbin is a symlink to /usr/sbin, so the binaries will still be available via /sbin anyway. This fixes the rpminspect pathmigration test failures. Resolves: RHEL-65827 Signed-off-by: Scott Mayhew <smayhew@redhat.com>
This commit is contained in:
parent
7d1873a478
commit
72712644aa
@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
|
|||||||
Name: nfs-utils
|
Name: nfs-utils
|
||||||
URL: http://linux-nfs.org/
|
URL: http://linux-nfs.org/
|
||||||
Version: 2.7.1
|
Version: 2.7.1
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
# group all 32bit related archs
|
# group all 32bit related archs
|
||||||
@ -156,7 +156,8 @@ sh -x autogen.sh
|
|||||||
--with-systemd \
|
--with-systemd \
|
||||||
--without-tcp-wrappers \
|
--without-tcp-wrappers \
|
||||||
--with-pluginpath=%{_libdir}/libnfsidmap \
|
--with-pluginpath=%{_libdir}/libnfsidmap \
|
||||||
--enable-junction
|
--enable-junction \
|
||||||
|
--disable-sbin-override
|
||||||
|
|
||||||
%make_build all
|
%make_build all
|
||||||
|
|
||||||
@ -165,7 +166,6 @@ sh -x autogen.sh
|
|||||||
|
|
||||||
rm -rf $RPM_BUILD_ROOT/*
|
rm -rf $RPM_BUILD_ROOT/*
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
|
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_pkgdir}/system
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdir}/system
|
||||||
@ -193,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.{a,la}
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
|
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
|
||||||
|
|
||||||
touch $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rmtab
|
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
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak
|
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak
|
||||||
@ -295,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/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
|
||||||
%doc linux-nfs/THANKS linux-nfs/TODO
|
%doc linux-nfs/THANKS linux-nfs/TODO
|
||||||
/sbin/rpc.statd
|
%{_sbindir}/rpc.statd
|
||||||
/sbin/nfsdcltrack
|
%{_sbindir}/nfsdcltrack
|
||||||
%{_sbindir}/exportfs
|
%{_sbindir}/exportfs
|
||||||
%{_sbindir}/nfsstat
|
%{_sbindir}/nfsstat
|
||||||
%{_sbindir}/rpcdebug
|
%{_sbindir}/rpcdebug
|
||||||
@ -323,11 +322,11 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
%{_pkgdir}/*/*
|
%{_pkgdir}/*/*
|
||||||
|
|
||||||
%attr(4755,root,root) /sbin/mount.nfs
|
%attr(4755,root,root) %{_sbindir}/mount.nfs
|
||||||
|
|
||||||
/sbin/mount.nfs4
|
%{_sbindir}/mount.nfs4
|
||||||
/sbin/umount.nfs
|
%{_sbindir}/umount.nfs
|
||||||
/sbin/umount.nfs4
|
%{_sbindir}/umount.nfs4
|
||||||
|
|
||||||
%files -n libnfsidmap
|
%files -n libnfsidmap
|
||||||
%doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
|
%doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
|
||||||
@ -356,11 +355,11 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
|||||||
%{_sbindir}/rpc.gssd
|
%{_sbindir}/rpc.gssd
|
||||||
%{_sbindir}/start-statd
|
%{_sbindir}/start-statd
|
||||||
%{_sbindir}/showmount
|
%{_sbindir}/showmount
|
||||||
%attr(4755,root,root) /sbin/mount.nfs
|
%attr(4755,root,root) %{_sbindir}/mount.nfs
|
||||||
/sbin/mount.nfs4
|
%{_sbindir}/mount.nfs4
|
||||||
/sbin/rpc.statd
|
%{_sbindir}/rpc.statd
|
||||||
/sbin/umount.nfs
|
%{_sbindir}/umount.nfs
|
||||||
/sbin/umount.nfs4
|
%{_sbindir}/umount.nfs4
|
||||||
%{_mandir}/*/nfs.5.gz
|
%{_mandir}/*/nfs.5.gz
|
||||||
%{_mandir}/*/nfs.conf.5.gz
|
%{_mandir}/*/nfs.conf.5.gz
|
||||||
%{_mandir}/*/nfsmount.conf.5.gz
|
%{_mandir}/*/nfsmount.conf.5.gz
|
||||||
@ -398,10 +397,10 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
|||||||
%{_sbindir}/nfsstat
|
%{_sbindir}/nfsstat
|
||||||
%{_libexecdir}/nfsrahead
|
%{_libexecdir}/nfsrahead
|
||||||
%{_udevrulesdir}/99-nfs.rules
|
%{_udevrulesdir}/99-nfs.rules
|
||||||
%attr(4755,root,root) /sbin/mount.nfs
|
%attr(4755,root,root) %{_sbindir}/mount.nfs
|
||||||
/sbin/mount.nfs4
|
%{_sbindir}/mount.nfs4
|
||||||
/sbin/umount.nfs
|
%{_sbindir}/umount.nfs
|
||||||
/sbin/umount.nfs4
|
%{_sbindir}/umount.nfs4
|
||||||
%{_mandir}/*/nfs.5.gz
|
%{_mandir}/*/nfs.5.gz
|
||||||
%{_mandir}/*/nfs.conf.5.gz
|
%{_mandir}/*/nfs.conf.5.gz
|
||||||
%{_mandir}/*/nfsmount.conf.5.gz
|
%{_mandir}/*/nfsmount.conf.5.gz
|
||||||
@ -429,6 +428,9 @@ rm -rf /etc/systemd/system/rpc-*.requires
|
|||||||
%{_mandir}/*/nfsiostat.8.gz
|
%{_mandir}/*/nfsiostat.8.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 14 2024 Scott Mayhew <smayhew@redhat.com> 2.7.1-6
|
||||||
|
- Move remaining binaries from /sbin to /usr/sbin (RHEL-65827)
|
||||||
|
|
||||||
* Thu Nov 14 2024 Scott Mayhew <smayhew@redhat.com> 2.7.1-5
|
* Thu Nov 14 2024 Scott Mayhew <smayhew@redhat.com> 2.7.1-5
|
||||||
- Add explicit version requirement for libnfsidmap (RHEL-65828)
|
- Add explicit version requirement for libnfsidmap (RHEL-65828)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user