- amfix patch for automake 1.5

- removed bashisms from post/preun
- release 7

Changed files:
    acct-amfix.patch -> 1.1
    psacct.spec -> 1.41

2 files changed, 35 insertions, 4 deletions

diff --git a/acct-amfix.patch b/acct-amfix.patch
new file mode 100644
index 0000000..a2d41f1
--- /dev/null
+++ b/acct-amfix.patch
@@ -0,0 +1,29 @@
+diff -Nur acct-6.3.5.orig/Makefile.am acct-6.3.5/Makefile.am
+--- acct-6.3.5.orig/Makefile.am	Thu Apr  9 01:54:03 1998
++++ acct-6.3.5/Makefile.am	Sun Oct 21 14:47:41 2001
+@@ -10,8 +10,13 @@
+ 
+ ## From what sources are those programs built?
+ 
++if NO_MKTIME
+ ac_SOURCES = ac.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
+-  @MKTIME_C@ utmp_rd.c
++  mktime.c utmp_rd.c
++else
++ac_SOURCES = ac.c common.c file_rd.c getopt.c getopt1.c hashtab.c \
++  utmp_rd.c
++endif
+ ac_LDADD = @ALLOCA@
+ 
+ accton_SOURCES = accton.c common.c getopt.c getopt1.c
+diff -Nur acct-6.3.5.orig/configure.in acct-6.3.5/configure.in
+--- acct-6.3.5.orig/configure.in	Wed May 27 06:59:23 1998
++++ acct-6.3.5/configure.in	Sun Oct 21 14:49:17 2001
+@@ -28,6 +28,7 @@
+ AC_CHECK_FUNC(mktime,
+               AC_DEFINE(HAVE_MKTIME)
+               MKTIME_C="" MKTIME_O="" )
++AM_CONDITIONAL(NO_MKTIME,test MKTIME_C = "mktime.c")
+ AC_CHECK_FUNC(getpagesize, AC_DEFINE(HAVE_GETPAGESIZE))
+ AC_CHECK_FUNC(rename, AC_DEFINE(HAVE_RENAME))
+ AC_CHECK_HEADERS(limits.h stdlib.h unistd.h string.h)
diff --git a/psacct.spec b/psacct.spec
index 2c525bf..38c2e2c 100644
--- a/psacct.spec
+++ b/psacct.spec
@@ -2,7 +2,7 @@ Summary:	Process accounting tools
 Summary(pl):	Program do logowania procesów użytkowników
 Name:		psacct
 Version:	6.3.5
-Release:	6
+Release:	7
 License:	GPL
 Group:		Applications/System
 Group(de):	Applikationen/System
@@ -10,6 +10,7 @@ Group(pl):	Aplikacje/System
 Source0:	ftp://prep.ai.mit.edu/pub/gnu/acct-%{version}.tar.gz
 Source1:	acct.logrotate
 Patch0:		acct-info.patch
+Patch1:		acct-amfix.patch
 Requires:	logrotate
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,6 +27,7 @@ użytkowników oraz monitorowania systemu.
 %prep
 %setup -q -n acct-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 aclocal
@@ -38,7 +40,7 @@ autoheader
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/logrotate.d,usr,var/account}
+install -d $RPM_BUILD_ROOT{/etc/logrotate.d,%{_prefix},/var/account}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -54,14 +56,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-/usr/sbin/accton &>/dev/null
+/usr/sbin/accton >/dev/null 2>&1
 echo "Type \"/usr/sbin/actton /var/account/pacct\" to run accounting."
 touch /var/account/{pacct,usracct,savacct}
 chmod 640 /var/account/{pacct,usracct,savacct}
 
 %preun
 if [ "$1" = "0" ]; then
-	/usr/sbin/accton &>/dev/null
+	/usr/sbin/accton >/dev/null 2>&1
 fi
 
 %postun