rpms/psacct/devel psacct-6.5.4-hzval.patch, NONE, 1.1 psacct.spec, 1.49, 1.50 psacct-6.3.2-hz.patch, 1.1, NONE

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/psacct/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7990

Modified Files:
	psacct.spec 
Added Files:
	psacct-6.5.4-hzval.patch 
Removed Files:
	psacct-6.3.2-hz.patch 
Log Message:
- Resolves: #575975
  Build psacct with --enable-linux-multiformat
- remove obsolete change
- fix sa problem with hzval variable


psacct-6.5.4-hzval.patch:
 sa.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE psacct-6.5.4-hzval.patch ---
diff -up acct-6.5.4/sa.c.pom acct-6.5.4/sa.c
--- acct-6.5.4/sa.c.pom	2010-02-12 02:24:11.000000000 +0100
+++ acct-6.5.4/sa.c	2010-06-25 12:32:18.000000000 +0200
@@ -280,7 +280,7 @@ int main(int argc, char *argv[])
 {
   int c;
 
-  static unsigned int hzval;
+  hzval = sysconf(_SC_CLK_TCK);
   program_name = argv[0];
 
   /* Cache the page size of the machine for the PAGES_TO_KB macro */


Index: psacct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- psacct.spec	19 Apr 2010 09:21:22 -0000	1.49
+++ psacct.spec	25 Jun 2010 10:47:22 -0000	1.50
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/System
 URL: ftp://ftp.gnu.org/pub/gnu/acct/
@@ -27,6 +27,7 @@ Patch6: psacct-6.3.2-sa-manfix.patch
 Patch8: psacct-6.3.2-lastcomm_man.patch
 Patch9: acct-6.3.2-sa_manpage.patch
 Patch11: psacct-6.3.2-man-pages.patch
+Patch12: psacct-6.5.4-hzval.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/chkconfig /sbin/install-info
@@ -58,15 +59,14 @@ commands.
 %patch8 -p1 -b .man
 %patch9 -p1 -b .pct
 %patch11 -p1 -b .new
+%patch12 -p1 -b .hzval
 
 %build
 %if ! %{FHS_compliant}
 autoconf
 %endif
 
-%configure
-sed -e "s/\/\* #undef HAVE_LINUX_ACCT_H \*\//#define HAVE_LINUX_ACCT_H/" config.h > config.h.new
-sed -e "s;#define HAVE_ACIO 1;/* #undef HAVE_ACIO */;" config.h.new > config.h
+%configure --enable-linux-multiformat
 touch texinfo.tex
 make
 
@@ -154,6 +154,12 @@ fi
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Fri Jun 18 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 6.5.4-4
+- Resolves: #575975
+  Build psacct with --enable-linux-multiformat
+- remove obsolete change
+- fix sa problem with hzval variable
+
 * Mon Apr 19 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 6.5.4-3
 - add force-reload action to init script
 


--- psacct-6.3.2-hz.patch DELETED ---