From 5c97dec908da9d38c6e5ec820d8ac8d125d3883c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Jan 2012 19:11:06 +0100 Subject: [PATCH] install everything in /usr This patch is needed for the /usr-move feature https://fedoraproject.org/wiki/Features/UsrMove This package requires now 'filesystem' >= 3, which is only installable on a system which has /bin, /sbin, /lib, /lib64 as symlinks to /usr and not regular directories. The 'filesystem' package acts as a guard, to prevent *this* package to be installed on old unconverted systems. New installations will have the 'filesystem' >=3 layout right away, old installations need to be converted with anaconda or dracut first; only after that, the 'filesystem' package, and also *this* package can be installed. Packages *should* not install files in /bin, /sbin, /lib, /lib64, but only in the corresponding directories in /usr. Packages *must* not install conflicting files with the same names in the corresponding directories in / and /usr. Especially compatibility symlinks must not be installed. Feel free to modify any of the changes to the spec file, but keep the above in mind. --- psacct.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/psacct.spec b/psacct.spec index ebf6c1e..7a59a8f 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.5.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Group: Applications/System URL: ftp://ftp.gnu.org/pub/gnu/acct/ @@ -16,16 +16,18 @@ Patch2: acct-6.3.2-sa_manpage.patch Patch3: psacct-6.3.2-man-pages.patch Patch4: acct-6.5.5-direntry.patch +Conflicts: filesystem < 3 +Conflicts: systemd < 39-1 Requires: /sbin/install-info Requires: coreutils Requires(post): chkconfig Requires(post): systemd-sysv -Requires(post): systemd-units +Requires(post): systemd-units >= 39-2 Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: autoconf -BuildRequires: systemd-units +BuildRequires: systemd-units >= 39-2 %description @@ -57,10 +59,6 @@ make install prefix=$RPM_BUILD_ROOT%{_prefix} \ infodir=$RPM_BUILD_ROOT%{_datadir}/info mandir=$RPM_BUILD_ROOT%{_mandir} cp dump-acct.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -# move accton to /sbin -- leave historical symlink -mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton -ln -s ../../sbin/accton $RPM_BUILD_ROOT%{_sbindir}/accton - # remove unwanted file rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -120,7 +118,6 @@ fi %{_unitdir}/psacct.service %attr(0600,root,root) %ghost %config /var/account/pacct %attr(0644,root,root) %config(noreplace) /etc/logrotate.d/* -/sbin/accton %{_sbindir}/accton %{_sbindir}/sa %{_sbindir}/dump-utmp @@ -142,6 +139,10 @@ fi %{_infodir}/accounting.info.gz %changelog +* Wed Jan 25 2012 Harald Hoyer 6.5.5-5 +- install everything in /usr + https://fedoraproject.org/wiki/Features/UsrMove + * Sat Jan 14 2012 Fedora Release Engineering - 6.5.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild