- rel 4; use _SC_CLK_TCK instead of hardcoded USER_HZ; add f14

Changed files:
    util-vserver-usersystime.patch -> 1.2
    util-vserver.spec -> 1.273

diff --git a/util-vserver-usersystime.patch b/util-vserver-usersystime.patch
index b697688950a7608503a563c907a4ba555d16d2fb..4c45356c5db84a8126e03066a28125c941860c27 100644 (file)
--- a/util-vserver-usersystime.patch
+++ b/util-vserver-usersystime.patch
@@ -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;

diff --git a/util-vserver.spec b/util-vserver.spec
index 5af4e6c8d7b0ce5daf2f72108b8005184b9ca91c..9cbe321affe45b6f06e1f5940ac85429d8ba06e7 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,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
@@ -880,6 +880,7 @@ exit 0
 %{_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