packages: util-vserver/util-vserver-usersystime.patch, util-vserver/util-vs...

[arekm]

Author: arekm                        Date: Tue Jan 18 19:04:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; use _SC_CLK_TCK instead of hardcoded USER_HZ; add f14

---- Files affected:
packages/util-vserver:
   util-vserver-usersystime.patch (1.1 -> 1.2) , util-vserver.spec (1.272 -> 1.273) 

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver-usersystime.patch
diff -u packages/util-vserver/util-vserver-usersystime.patch:1.1 packages/util-vserver/util-vserver-usersystime.patch:1.2
--- packages/util-vserver/util-vserver-usersystime.patch:1.1	Tue Jan 18 19:40:37 2011
+++ packages/util-vserver/util-vserver-usersystime.patch	Tue Jan 18 20:04:36 2011
@@ -49,8 +49,8 @@
 -      res->utime_total	+= sched.user_msec;
 -      res->stime_total	+= sched.sys_msec;
 -    }
-+    res->utime_total	= utime_total * 100 /* USER_HZ */;
-+    res->stime_total	= stime_total * 100 /* USER_HZ */;
++    res->utime_total	= utime_total * sysconf(_SC_CLK_TCK) /* USER_HZ */;
++    res->stime_total	= stime_total * sysconf(_SC_CLK_TCK) /* USER_HZ */;
    }
    
    res->VmSize_total	+= process->VmSize;

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.272 packages/util-vserver/util-vserver.spec:1.273
--- packages/util-vserver/util-vserver.spec:1.272	Tue Jan 18 19:54:46 2011
+++ packages/util-vserver/util-vserver.spec	Tue Jan 18 20:04:36 2011
@@ -20,7 +20,7 @@
 %endif
 
 %define		snap	pre2926
-%define		rel	3
+%define		rel	4
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -881,6 +881,7 @@
 %{_libdir}/%{name}/distributions/f11
 %{_libdir}/%{name}/distributions/f12
 %{_libdir}/%{name}/distributions/f13
+%{_libdir}/%{name}/distributions/f14
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3
@@ -946,6 +947,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.273  2011/01/18 19:04:36  arekm
+- rel 4; use _SC_CLK_TCK instead of hardcoded USER_HZ; add f14
+
 Revision 1.272  2011/01/18 18:54:46  arekm
 - rel 3; R texlive-fonts-rsfs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver-usersystime.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.272&r2=1.273&f=u