Use %%license, drop legacy sys-v bits

This commit is contained in:
Peter Robinson 2018-10-17 10:24:27 +01:00
parent ecbffa61d1
commit 8cf3111685

View File

@ -4,9 +4,8 @@
Summary: Utilities for monitoring process activities
Name: psacct
Version: 6.6.4
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
Group: Applications/System
URL: http://www.gnu.org/software/acct/
Source: ftp://ftp.gnu.org/pub/gnu/acct/acct-%{version}.tar.gz
@ -21,8 +20,6 @@ Patch3: psacct-6.6.4-lastcomm-manpage-pid-twice.patch
Conflicts: filesystem < 3
Requires: /sbin/install-info
Requires: coreutils
Requires(post): chkconfig
Requires(post): systemd-sysv
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@ -113,19 +110,10 @@ fi
%postun
%systemd_postun_with_restart psacct.service
%triggerun -- psacct < 6.5.5-3
# Save the current service runlevel info
# User must manually run systemd-sysv-convert --apply psacct
# to migrate them to systemd targets
%{_bindir}/systemd-sysv-convert --save psacct >/dev/null 2>&1 ||:
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del psacct >/dev/null 2>&1 || :
/bin/systemctl try-restart psacct.service >/dev/null 2>&1 || :
%files
%doc README COPYING
%license COPYING
%doc README
%dir /var/account
%{_unitdir}/psacct.service
%attr(0600,root,root) %ghost %config /var/account/pacct
@ -153,6 +141,9 @@ fi
%changelog
* Wed Oct 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 6.6.4-3
- Use %%license, drop legacy sys-v bits
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild