commit libgtop

28 Mar 2006

Hello community,

here is the log from the commit of package libgtop
checked in at Wed Mar 29 00:15:00 CEST 2006.

--------

--- /work/SRC/all/GNOME/libgtop/libgtop.changes	2006-02-04 15:11:29.000000000 +0100
+++ /work/src/done/STABLE/libgtop/libgtop.changes	2006-03-28 19:34:36.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 28 19:32:59 CEST 2006 - joeshaw@suse.de
+
+- Add a patch which makes the "Resident" field RSS - Shared,
+  rather than just being a duplicate of RSS.  Fixes half of
+  bnc #157022.  Submitted upstream as bgo #336376.
+- Remove an unused, commented-out patch
+
+-------------------------------------------------------------------

Old:
----
  libgtop-2.0.2.diff

New:
----
  libgtop-resident-field-fix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libgtop.spec ++++++
--- /var/tmp/diff_new_pack.Ybxqsj/_old	2006-03-29 00:13:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Ybxqsj/_new	2006-03-29 00:13:16.000000000 +0200
@@ -5,7 +5,7 @@
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -20,10 +20,10 @@
 PreReq:       %install_info_prereq
 Autoreqprov:  on
 Version:      2.12.2
-Release:      5
+Release:        13
 Summary:      LibGTop Library
 Source0:      ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/%{name}-%{version}.tar.bz2
-Patch:        %{name}-2.0.2.diff
+Patch:          libgtop-resident-field-fix.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,7 +62,7 @@
 
 %prep
 %setup
-#%patch -p1
+%patch
 
 %build
 rename no nb po/no.*
@@ -120,6 +120,11 @@
 # %{prefix}/include/gnome/gnomesupport.h
 
 %changelog -n libgtop
+* Tue Mar 28 2006 - joeshaw@suse.de
+- Add a patch which makes the "Resident" field RSS - Shared,
+  rather than just being a duplicate of RSS.  Fixes half of
+  bnc #157022.  Submitted upstream as bgo #336376.
+- Remove an unused, commented-out patch
 * Sat Feb 04 2006 - aj@suse.de
 - Reduce BuildRequires.
 * Thu Jan 26 2006 - sbrabec@suse.cz

++++++ libgtop-resident-field-fix.patch ++++++
Index: sysdeps/linux/procmem.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/linux/procmem.c,v
retrieving revision 1.27
diff -u -p -u -r1.27 procmem.c
--- sysdeps/linux/procmem.c	22 Jul 2005 19:20:39 -0000	1.27
+++ sysdeps/linux/procmem.c	28 Mar 2006 17:10:25 -0000
@@ -75,13 +75,16 @@ glibtop_get_proc_mem_s (glibtop *server,
 		return;
 
 	buf->size     = strtoull (buffer, &p, 0);
-	buf->resident = strtoull (p, &p, 0);
+
+	p = skip_token (p); /* RSS again */
+
 	buf->share    = strtoull (p, &p, 0);
 
 	buf->size     *= pagesize;
-	buf->resident *= pagesize;
 	buf->share    *= pagesize;
 	buf->rss      *= pagesize;
+
+	buf->resident = buf->rss - buf->share;
 
 	buf->flags |= _glibtop_sysdeps_proc_mem_statm;
 }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)