From 28c7f6f7881f2579d634107a0d5049a220d70cc7 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 10:48:58 +0000
Subject: [PATCH] auto-import changelog data from psacct-6.3.2-27.src.rpm Wed
 Jan 22 2003 Tim Powers <timp@redhat.com> - rebuilt Thu Dec 26 2002 Florian La
 Roche <Florian.LaRoche@redhat.de> - make /etc/info-dir an optional file Wed
 Nov 13 2002 Mike A. Harris <mharris@redhat.com> 6.3.2-25 - Added with_last
 conditional to disable /usr/bin/last because ours is in     the SysVInit
 package. This fixes unpackaged files terminate build prob.

---
 psacct.spec | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/psacct.spec b/psacct.spec
index 14fa392..993184a 100644
--- a/psacct.spec
+++ b/psacct.spec
@@ -1,4 +1,5 @@
-#Excludearch: ia64
+# Our /usr/bin/last is in the SysVInit packae
+%define with_last	0
 
 %define FHS_compliant 1
 
@@ -11,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 24
+Release: 27
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -97,6 +98,9 @@ EOF
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/psacct
 
+%if ! %{with_last}
+rm -f $RPM_BUILD_ROOT%{_bindir}/last $RPM_BUILD_ROOT%{_mandir}/man1/last.1*
+%endif
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -105,8 +109,10 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/psacct
 /sbin/chkconfig --add psacct
 # we need this hack to get rid of an old, incorrect accounting info entry.
 if [ $1 = 0 ]; then
-  grep -v '* accounting: (psacct)' < /etc/info-dir > /etc/info-dir.new
-  mv -f /etc/info-dir.new /etc/info-dir
+  test -f /etc/info-dir && {
+    grep -v '* accounting: (psacct)' < /etc/info-dir > /etc/info-dir.new
+    mv -f /etc/info-dir.new /etc/info-dir
+  }
   /sbin/install-info %{_infodir}/accounting.info.gz %{_infodir}/dir --entry="* accounting: (accounting).            The GNU Process Accounting Suite."
 fi
 
@@ -130,14 +136,30 @@ fi
 %{_sbindir}/dump-utmp
 %{_sbindir}/dump-acct
 %{_bindir}/ac
+%if %{with_last}
+%{_bindir}/last
+%endif
 %{_bindir}/lastcomm
 %{_mandir}/man1/ac.1*
+%if %{with_last}
+%{_mandir}/man1/last.1*
+%endif
 %{_mandir}/man1/lastcomm.1*
 %{_mandir}/man8/sa.8*
 %{_mandir}/man8/accton.8*
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Thu Dec 26 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- make /etc/info-dir an optional file
+
+* Wed Nov 13 2002 Mike A. Harris <mharris@redhat.com> 6.3.2-25
+- Added with_last conditional to disable /usr/bin/last because ours is in
+  the SysVInit package.  This fixes unpackaged files terminate build prob.
+
 * Thu Aug 22 2002 Mike A. Harris <mharris@redhat.com> 6.3.2-24
 - Fixed initscript reload/restart by creating start/stop functions and
   making everything use them (#72261)