- small spec changes

- change buildroot
- remove makeinstall macro
This commit is contained in:
Ivana Varekova 2007-04-05 13:40:43 +00:00
parent bca2ec81d3
commit 8e9018e15d

View File

@ -12,7 +12,7 @@
Summary: Utilities for monitoring process activities Summary: Utilities for monitoring process activities
Name: psacct Name: psacct
Version: 6.3.2 Version: 6.3.2
Release: 43%{?dist} Release: 44%{?dist}
License: GPL License: GPL
Group: Applications/System Group: Applications/System
Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@ -30,8 +30,8 @@ Patch6: psacct-6.3.2-sa-manfix.patch
Patch7: psacct-6.3.2-LargeFile.patch Patch7: psacct-6.3.2-LargeFile.patch
Patch8: psacct-6.3.2-lastcomm_man.patch Patch8: psacct-6.3.2-lastcomm_man.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Prereq: /sbin/chkconfig /sbin/install-info Requires: /sbin/chkconfig /sbin/install-info
BuildRequires: autoconf BuildRequires: autoconf
Requires: coreutils Requires: coreutils
@ -77,7 +77,9 @@ make
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir},%{_mandir},%{_sbindir}} mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir},%{_mandir},%{_sbindir}}
%{makeinstall} make install prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} sbindir=$RPM_BUILD_ROOT%{_sbindir} \
infodir=$RPM_BUILD_ROOT%{_datadir}/info mandir=$RPM_BUILD_ROOT%{_mandir}
# move accton to /sbin -- leave historical symlink # move accton to /sbin -- leave historical symlink
mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton
@ -140,7 +142,7 @@ if [ $1 = 0 ]; then
fi fi
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%if %{FHS_compliant} %if %{FHS_compliant}
%dir /var/account %dir /var/account
%endif %endif
@ -167,6 +169,11 @@ fi
%{_infodir}/accounting.info.gz %{_infodir}/accounting.info.gz
%changelog %changelog
* Thu Apr 5 2007 Ivana Varekova <varekova@redhat.com> - 6.3.2-44
- small spec changes
- change buildroot
- remove makeinstall macro
* Tue Jan 23 2007 Ivana Varekova <varekova@redhat.com> - 6.3.2-43 * Tue Jan 23 2007 Ivana Varekova <varekova@redhat.com> - 6.3.2-43
- Resolves: 223728 - Resolves: 223728
psacct logrotate file looks for non existant directory psacct logrotate file looks for non existant directory