- Dropping psacct-6.3.2-man-pages.patch

- (Re)introducing modified dump-acct man page

acct-6.5.5-direntry.patch

@@ -1,12 +0,0 @@
-diff -up ./acct-6.5.5/accounting.texi.direntry ./acct-6.5.5/accounting.texi
---- acct-6.5.5/accounting.texi.direntry	2010-10-23 13:33:27.000000000 +0200
-+++ acct-6.5.5/accounting.texi	2010-11-09 16:33:58.369160001 +0100
-@@ -5,7 +5,7 @@
- @dircategory GNU Utilities
- 
- @direntry
--* acct: (acct).                The GNU Accounting utilities for process and login accounting
-+* acct: (accounting).          The GNU Accounting utilities for process and login accounting
- @end direntry
- 
- 

psacct-6.6.1-RH-man-page-scan.patch

@@ -49,36 +49,6 @@ diff -Naur acct-6.6.1.orig/dump-acct.c acct-6.6.1/dump-acct.c
    print_acct_file_location ();
  }
  
-diff -Naur acct-6.6.1.orig/dump-acct.8 acct-6.6.1/dump-acct.8
---- acct-6.6.1.orig/dump-acct.8	2013-07-31 15:44:16.000000000 +0200
-+++ acct-6.6.1/dump-acct.8	2013-07-31 17:48:53.348679419 +0200
-@@ -7,7 +7,9 @@
- 
- .SH SYNOPSYS
- \fBdump-acct\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
--       [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
-+       [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR]
-+       [\fB--byte-swap\fR] [\fB--format\fR]
-+       [\fB--ahz\fR <\fIfreq\fR>] [\fB--help\fR]
- 
- .SH DESCRIPTION
- The dump-acct command transforms the output \fBfile\fR from the
-@@ -31,6 +33,15 @@
- .TP
- .B -n, --num NUMRECS
- Display only the first NUMRECS number of records.
-+.TP
-+.B --ahz FREQ
-+Set the AHZ (platform dependent frequency in Hertz) to FREQ.
-+.TP
-+.B --byteswap
-+Swap the bytes (relative to your system's native byte order) in --raw output.
-+.TP
-+.B --format
-+Set output format with --raw option.
- 
- .SH SEE ALSO
- accton (8), lastcomm (1)
 diff -Naur acct-6.6.1.orig/lastcomm.c acct-6.6.1/lastcomm.c
 --- acct-6.6.1.orig/lastcomm.c	2011-03-16 23:50:13.000000000 +0100
 +++ acct-6.6.1/lastcomm.c	2013-07-31 18:01:57.772529043 +0200

psacct-6.6.1-man-dump-acct.patch

@@ -0,0 +1,57 @@
+diff -Naur acct-6.6.1.orig/dump-acct.8 acct-6.6.1/dump-acct.8
+--- acct-6.6.1.orig/dump-acct.8	2013-07-31 18:56:57.000000000 +0200
++++ acct-6.6.1/dump-acct.8	2013-07-31 19:19:21.606615965 +0200
+@@ -0,0 +1,53 @@
++.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
++.\" Written by Ivana Hutarova Varekova <varekova@redhat.com>
++.TH DUMP_ACCT 8 "2009 December 2" "Linux accounting system"
++
++.SH NAME
++dump\-acct \- print an acct/pacct file in human-readable format
++
++.SH SYNOPSIS
++.B dump-acct
++[\fB\-r\fR|\fB\-\-reverse\fR]
++[\fB\-R\fR|\fB\-\-raw\fR]
++[\fB\-n\fR|\fB\-\-num\fR\ \fIrecs\fR]
++[\fB\-\-byte\-swap\fR]
++[\fB\-\-format\fR]
++[\fB\-\-ahz\fR\ \fIfreq\fR]
++[\fB\-h\fR|\fB\-\-help\fR]
++[\fIfiles\fR]
++
++.SH DESCRIPTION
++The dump-acct command transforms the output \fBfile\fR from the
++accton format to the human-readable format: one record per line.
++Each record consists of severald fields which are separated by
++character "|" (the meaning of concreate field depends on the
++version of kernel package - with which the accton file was created).
++
++.SH OPTIONS
++The following options are supported:
++.TP
++.B -r, --reverse
++Print the output in reverse order.
++.TP
++.B -R, --raw
++The records will be printed without any parsing.
++.TP
++.B -n, --num NUMRECS
++Display only the first NUMRECS number of records.
++.TP
++.B --byteswap
++Swap the bytes (relative to your system's native byte order) in --raw output.
++.TP
++.B --format
++Set output format with --raw option.
++.TP
++.B --ahz FREQ
++Set the AHZ (platform dependent frequency in Hertz) to FREQ.
++.TP
++.B -h, --help
++Print a help message and the default location of the process accounting file
++and exit.
++
++.SH SEE ALSO
++accton (8), lastcomm (1)
++

psacct.spec

@@ -4,7 +4,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/System
 URL: ftp://ftp.gnu.org/pub/gnu/acct/
@@ -14,9 +14,13 @@ Source2: psacct-logrotate.in
 Source3: accton-create
 Patch1: psacct-6.3.2-lastcomm_man.patch
 Patch2: acct-6.3.2-sa_manpage.patch
-Patch3: psacct-6.3.2-man-pages.patch
+# The upstream man page is more correct than the usage
+# .. the C sources need to be fixed, not the man page
+#Patch3: psacct-6.3.2-man-pages.patch
 Patch4: psacct-6.6.1-unnumberedsubsubsec.patch
 Patch5: psacct-6.6.1-RH-man-page-scan.patch
+# Partial replacement for Patch3: psacct-6.3.2-man-pages.patch
+Patch6: psacct-6.6.1-man-dump-acct.patch
 
 Conflicts: filesystem < 3
 Conflicts: systemd < 39-1
@@ -46,9 +50,10 @@ commands.
 
 %patch1 -p1 -b .man
 %patch2 -p1 -b .pct
-%patch3 -p1 -b .new
+#%%patch3 -p1 -b .new
 %patch4 -p1 -b .subsubsec
 %patch5 -p1 -b .rh-man-scan
+%patch6 -p1 -b .man-dump-acct
 
 # fixing 'gets' undeclared
 sed -i 's|.*(gets,.*||g' lib/stdio.in.h
@@ -142,6 +147,10 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Jul 31 2013 Jaromir Capik <jcapik@redhat.com> - 6.6.1-5
+- Dropping psacct-6.3.2-man-pages.patch
+- (Re)introducing modified dump-acct man page
+
 * Wed Jul 31 2013 Jaromir Capik <jcapik@redhat.com> - 6.6.1-4
 - RH man page scan (#948523)