rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rely on presets and use standard macros for systemd unit handling (bz 2218006)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Christian Glombek 2023-09-18 16:46:57 -04:00 committed by Steve Dickson
parent f1e9bac0ff
commit b63be16793
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nfs-utils.spec
View File

@ -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.6.3 Version: 2.6.3
Release: 1.rc3%{?dist} Release: 2.rc3%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -253,46 +253,23 @@ if [ $? -eq 1 ]; then
fi fi
%post %post
if [ $1 -eq 1 ] ; then %systemd_post nfs-client.target nfs-server.service
# Initial installation
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
/bin/systemctl start nfs-client.target >/dev/null 2>&1 || :
fi
%systemd_post nfs-server
%post -n nfsv4-client-utils
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
/bin/systemctl start nfs-client.target >/dev/null 2>&1 || :
fi
%preun %preun
%systemd_preun nfs-client.target nfs-server.service
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%systemd_preun nfs-client.target : >%{_localstatedir}/lib/rpm-state/nfs-server.cleanup
%systemd_preun nfs-server.service
rm -rf /var/lib/nfs/statd
rm -rf /var/lib/nfs/v4recovery
fi fi
%preun -n nfsv4-client-utils %posttrans
if [ $1 -eq 0 ]; then if [ -f %{_localstatedir}/lib/rpm-state/nfs-server.cleanup ]; then
%systemd_preun nfs-client.target rm %{_localstatedir}/lib/rpm-state/nfs-server.cleanup || :
rm -rf /var/lib/nfs/statd || :
rm -rf /etc/nfsmount.conf.d rm -rf /var/lib/nfs/v4recovery || :
rm -rf /var/lib/nfs/v4recovery
fi fi
%postun %postun
%systemd_postun_with_restart nfs-client.target %systemd_postun_with_reload nfs-client.target nfs-server.service
%systemd_postun_with_restart nfs-server
%postun -n nfsv4-client-utils
%systemd_postun_with_restart nfs-client.target
/bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
%triggerin -- nfs-utils > 1:2.6.2-1 %triggerin -- nfs-utils > 1:2.6.2-1
/bin/systemctl try-restart gssproxy || : /bin/systemctl try-restart gssproxy || :
@ -457,6 +434,10 @@ rm -rf /etc/systemd/system/rpc-*.requires
%{_mandir}/*/nfsiostat.8.gz %{_mandir}/*/nfsiostat.8.gz
%changelog %changelog
* Mon Sep 18 2023 Christian Glombek <cglombek@redhat.com> 2.6.3-2.rc3
- Rely on presets and use standard macros for systemd unit handling (bz 2218006)
- Cleanup is moved to %%posttrans
* Fri Aug 11 2023 Steve Dickson <steved@redhat.com> 2.6.3-1.rc3 * Fri Aug 11 2023 Steve Dickson <steved@redhat.com> 2.6.3-1.rc3
- Updated to the latest RC release: nfs-utils-2-6-4-rc3 - Updated to the latest RC release: nfs-utils-2-6-4-rc3
- Fixed a regression in the junction code (bz 2213669) - Fixed a regression in the junction code (bz 2213669)