From c26d4b031b3aac3894056b8674df2df77fb1fa54e579d5d7f579bc8e4b9ce584 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 22 Jun 2008 01:22:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgtop?expand=0&rev=13 --- libgtop-2.22.1.tar.bz2 | 3 -- libgtop-2.23.2.tar.bz2 | 3 ++ libgtop-bnc386735.patch | 42 --------------------- libgtop-resident-field-fix.patch | 26 ------------- libgtop.changes | 16 ++++++++ libgtop.spec | 65 ++++++++++++++++++-------------- 6 files changed, 55 insertions(+), 100 deletions(-) delete mode 100644 libgtop-2.22.1.tar.bz2 create mode 100644 libgtop-2.23.2.tar.bz2 delete mode 100644 libgtop-bnc386735.patch delete mode 100644 libgtop-resident-field-fix.patch diff --git a/libgtop-2.22.1.tar.bz2 b/libgtop-2.22.1.tar.bz2 deleted file mode 100644 index f7a9716..0000000 --- a/libgtop-2.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e81771a591f3ba70d8ac4d8b2253616a1a227a16d84317ff4f7e29c7f07658d -size 781484 diff --git a/libgtop-2.23.2.tar.bz2 b/libgtop-2.23.2.tar.bz2 new file mode 100644 index 0000000..deb04c5 --- /dev/null +++ b/libgtop-2.23.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:719f9261284df8d5f36ae99f3d3b54d2629c5d8122fa9c436a642c80aafb3717 +size 788360 diff --git a/libgtop-bnc386735.patch b/libgtop-bnc386735.patch deleted file mode 100644 index 7e2f652..0000000 --- a/libgtop-bnc386735.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: sysdeps/linux/glibtop_private.c -=================================================================== ---- sysdeps/linux/glibtop_private.c (revision 2740) -+++ sysdeps/linux/glibtop_private.c (revision 2741) -@@ -119,20 +119,27 @@ - static unsigned long - read_boot_time(glibtop *server) - { -- char buffer[BUFSIZ]; -- char *btime; -+ char* line = NULL; -+ size_t size = 0; -+ FILE* stat; -+ unsigned long btime = 0; - -- file_to_buffer(server, buffer, sizeof buffer, "/proc/stat"); -+ if (!(stat = fopen("/proc/stat", "r"))) { -+ glibtop_error_io_r(server, "fopen(\"/proc/stat\")"); -+ goto out; -+ } - -- btime = strstr(buffer, "btime"); -- -- if (!btime) { -- glibtop_warn_io_r(server, "cannot find btime in /proc/stat"); -- return 0UL; -+ while (getline(&line, &size, stat) != -1) { -+ if (!strncmp(line, "btime", 5)) { -+ btime = strtoul(skip_token(line), NULL, 10); -+ break; -+ } - } - -- btime = skip_token(btime); -- return strtoul(btime, NULL, 10); -+ free(line); -+ fclose(stat); -+out: -+ return btime; - } - - diff --git a/libgtop-resident-field-fix.patch b/libgtop-resident-field-fix.patch deleted file mode 100644 index 6d1a94a..0000000 --- a/libgtop-resident-field-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -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; - } diff --git a/libgtop.changes b/libgtop.changes index 719a1ec..738f31d 100644 --- a/libgtop.changes +++ b/libgtop.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Jun 17 09:59:30 CEST 2008 - aj@suse.de + +- Do not build require gtk-doc. + +------------------------------------------------------------------- +Mon Jun 16 21:06:29 CEST 2008 - maw@suse.de + +- Update to version 2.23.2: + + glibtop_get_proc_open_files API can also lists IPv6 TCP sockets + + glibtop_get_proc_affinity : new API to retrieve process CPU + affinity + + Fixed parsing of big /proc/stat for uptime +- Remove stale patches: gnome-system-monitor-resident-schema.patch + and libgtop-bnc386735.patch. + ------------------------------------------------------------------- Mon May 12 16:14:07 EDT 2008 - hfiguiere@suse.de diff --git a/libgtop.spec b/libgtop.spec index 83fab0f..46ef0a3 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -1,5 +1,5 @@ # -# spec file for package libgtop (Version 2.22.1) +# spec file for package libgtop (Version 2.23.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,21 +11,17 @@ Name: libgtop -BuildRequires: fdupes gdbm-devel glib2-devel gtk-doc intltool licenses popt-devel xorg-x11-devel +BuildRequires: fdupes gdbm-devel glib2-devel intltool licenses popt-devel xorg-x11-devel License: GPL v2 or later Group: Development/Libraries/GNOME -Version: 2.22.1 -Release: 12 +Version: 2.23.2 +Release: 1 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libgtop-2_0) %define libgtop-2_0_name 7 Summary: LibGTop Library Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/2.19/%{name}-%{version}.tar.bz2 Source1: %{name}_spec-update.sh -#PATCH-FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default -Patch: libgtop-resident-field-fix.patch -#PATCH-FIX-UPSTREAM libgtop-bnc386735.patch bnc386735 hfiguiere@suse.de -- Already in SVN. -Patch2: libgtop-bnc386735.patch Requires: libgtop-2_0-7 licenses Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +65,7 @@ Authors: %package devel License: GPL v2 or later -Summary: Include Files and Libraries mandatory for Development. +Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gdbm-devel xorg-x11-devel PreReq: %install_info_prereq @@ -90,6 +86,7 @@ License: GPL v2 or later Summary: LibGTop Library Group: Development/Libraries/GNOME Requires: %{name} = %{version} +PreReq: /sbin/install-info %description doc A library that fetches information about the running system, such as @@ -109,8 +106,6 @@ Authors: %lang_package %prep %setup -q -%patch -%patch2 # rpmlint note: libgtop has a separate translation for both Bengali and Bengali India %build @@ -166,20 +161,32 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-, root, root) +%dir %{_datadir}/gtk-doc/ +%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html/libgtop %{_datadir}/gtk-doc/html/libgtop/* %doc %{_infodir}/*.info* %changelog -* Mon May 12 2008 hfiguiere@suse.de +* Tue Jun 17 2008 aj@suse.de +- Do not build require gtk-doc. +* Mon Jun 16 2008 maw@suse.de +- Update to version 2.23.2: + + glibtop_get_proc_open_files API can also lists IPv6 TCP sockets + + glibtop_get_proc_affinity : new API to retrieve process CPU + affinity + + Fixed parsing of big /proc/stat for uptime +- Remove stale patches: gnome-system-monitor-resident-schema.patch + and libgtop-bnc386735.patch. +* Tue May 13 2008 hfiguiere@suse.de - added libgtop-bnc386735.patch to fix bnc#386735. * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support -* Wed Apr 09 2008 maw@suse.de +* Thu Apr 10 2008 maw@suse.de - Update to version 2.22.1: + Bug fixed: bgo#525953. -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Fixed proc_kernel. * Tue Mar 04 2008 maw@suse.de @@ -203,7 +210,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Sep 17 2007 sbrabec@suse.cz - Updated to version 2.20.0: * updated translations -* Mon Sep 10 2007 maw@suse.de +* Tue Sep 11 2007 maw@suse.de - Update to version 2.19.92: + Fix hardwired path in linux/sysinfo.c. * Tue Aug 07 2007 maw@suse.de @@ -215,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jul 17 2007 sbrabec@suse.cz - Fixed shared library packaging. - Added script to update library package names. -* Mon Jul 09 2007 maw@suse.de +* Tue Jul 10 2007 maw@suse.de - Rename the package to libgtop-2_0-7 - Update to version 2.19.4 - Minor API change - get_proclist returns pit_t instead of unsigned @@ -228,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT - Add gdbm-devel BuildRequires. * Tue Feb 27 2007 maw@suse.de - Create a -doc subpackage (#248813). -* Mon Feb 19 2007 maw@suse.de +* Tue Feb 20 2007 maw@suse.de - Update to version 2.14.7 - Remove libgtop-buffer-overflow.patch which is now upstream - Package gtk-doc generated docs in the -devel subpackage. @@ -238,20 +245,20 @@ rm -rf $RPM_BUILD_ROOT - Add libgtop-buffer-overflow.patch (#235086 and CVE-2007-0235). * Mon Jan 08 2007 sbrabec@suse.cz - Spec file cleanup. -* Sun Jan 07 2007 ro@suse.de +* Mon Jan 08 2007 ro@suse.de - GNOME moved to /usr * Tue Oct 03 2006 jhargadon@suse.de - update to version 2.14.4 - Fixed linux maps/smaps parsing on 64bit kernel - Fixed build with --as-needed - Added missing G_BEGIN_DECLS/G_END_DECLS -* Tue Aug 15 2006 jhargadon@suse.de +* Wed Aug 16 2006 jhargadon@suse.de - update to version 2.14.2 - Updated solaris support - interface addition to handle wireless interfaces. * Tue Aug 15 2006 sbrabec@suse.cz - Call ldconfig (#198912). -* Tue Aug 01 2006 gekker@suse.de +* Wed Aug 02 2006 gekker@suse.de - Update to version 2.14.1 * Updated translations. * Fixed NetBSD port (Julio M. Merino Vidal ). @@ -276,7 +283,7 @@ rm -rf $RPM_BUILD_ROOT - Added %%install_info_prereq. * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Nov 30 2005 gekker@suse.de +* Thu Dec 01 2005 gekker@suse.de - Update to version 2.12.2 * Mon Sep 05 2005 gekker@suse.de - Update to version 2.12.0 (GNOME 2.12) @@ -284,20 +291,20 @@ rm -rf $RPM_BUILD_ROOT - Update to version 2.11.92 * Mon Aug 08 2005 rodrigo@suse.de - Updated to 2.11.91 -* Tue Aug 02 2005 gekker@suse.de +* Wed Aug 03 2005 gekker@suse.de - Update to version 2.11.90 - Fixup devel requirements -* Fri Jul 22 2005 gekker@suse.de +* Sat Jul 23 2005 gekker@suse.de - Update to version 2.11.2 -* Tue Jun 21 2005 gekker@suse.de +* Wed Jun 22 2005 gekker@suse.de - Update to version 2.11.0 * Fri Jun 17 2005 sbrabec@suse.cz - Build with libXau on x86_64 (#91187). * Wed Jun 01 2005 sbrabec@suse.cz - Fixed devel requirements. -* Wed Mar 09 2005 gekker@suse.de +* Thu Mar 10 2005 gekker@suse.de - Update to version 2.10.0 (GNOME 2.10). -* Thu Mar 03 2005 gekker@suse.de +* Fri Mar 04 2005 gekker@suse.de - Update to version 2.9.92 * Fri Feb 11 2005 gekker@suse.de - Update to version 2.9.91 @@ -305,7 +312,7 @@ rm -rf $RPM_BUILD_ROOT - updated to version 2.9.90 * Mon Jan 24 2005 ro@suse.de - fix build on x86_64 working around non-fPIC libXau -* Fri Jan 21 2005 gekker@suse.de +* Sat Jan 22 2005 gekker@suse.de - Update to version 2.9.4 * Tue Jan 04 2005 gekker@suse.de - Update to version 2.9.3 @@ -340,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Jun 26 2003 sbrabec@suse.cz - Cleaned up neededforbuild. - Use %%find_lang. -* Sun Jun 22 2003 ro@suse.de +* Mon Jun 23 2003 ro@suse.de - added gnome-filesystem to neededforbuild - added directories to filelist * Tue May 27 2003 sbrabec@suse.cz @@ -359,7 +366,7 @@ rm -rf $RPM_BUILD_ROOT - fix filelist * Wed May 15 2002 ro@suse.de - use libdir -* Wed Apr 17 2002 ro@suse.de +* Thu Apr 18 2002 ro@suse.de - fix for automake-1.6 * Thu Jan 17 2002 hhetter@suse.de - prefixed to /opt/gnome2