This commit is contained in:
Matthias Clasen 2009-03-02 20:40:46 +00:00
parent 68c1208d7a
commit 744ec95ea5
4 changed files with 10 additions and 41 deletions

View File

@ -1 +1 @@
libgtop-2.25.91.tar.bz2
libgtop-2.26.0.tar.bz2

View File

@ -6,23 +6,16 @@
Name: libgtop2
Summary: libgtop library (version 2)
Version: 2.25.91
Release: 2%{?dist}
Version: 2.26.0
Release: 1%{?dist}
License: GPLv2+
URL: http://download.gnome.org/sources/libgtop/2.25
URL: http://download.gnome.org/sources/libgtop/2.26
Group: System Environment/Libraries
Source: http://download.gnome.org/sources/libgtop/2.25/libgtop-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: glib2 >= %{glib2_version}
Source: http://download.gnome.org/sources/libgtop/2.26/libgtop-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: texinfo libtool gettext
BuildRequires: intltool
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gtk-doc
# http://bugzilla.gnome.org/show_bug.cgi?id=468495
Patch0: read-cpuinfo-completely.patch
%description
libgtop is a library for portably obtaining information about processes,
@ -42,7 +35,6 @@ files to allow you to develop with libgtop.
%prep
%setup -q -n libgtop-%{version}
%patch0 -p1 -b .read-cpuinfo-completely
%build
%configure --disable-gtk-doc --disable-static
@ -79,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_datadir}/info
%changelog
* Mon Mar 2 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-1
- Update to 2.26.0
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25.91-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

View File

@ -1,26 +0,0 @@
diff -up libgtop-2.24.0/sysdeps/linux/sysinfo.c.read-cpuinfo-completely libgtop-2.24.0/sysdeps/linux/sysinfo.c
--- libgtop-2.24.0/sysdeps/linux/sysinfo.c.read-cpuinfo-completely 2008-05-23 18:13:20.000000000 -0400
+++ libgtop-2.24.0/sysdeps/linux/sysinfo.c 2008-11-09 21:04:38.000000000 -0500
@@ -36,12 +36,12 @@ static glibtop_sysinfo sysinfo = { .flag
static void
init_sysinfo (glibtop *server)
{
- char buffer [16384];
+ gchar *buffer;
gchar ** processors;
if(G_LIKELY(sysinfo.flags)) return;
- file_to_buffer(server, buffer, sizeof buffer, FILENAME);
+ if (!g_file_get_contents("/proc/cpuinfo", &buffer, NULL, NULL)) return;
/* cpuinfo records are seperated by a blank line */
processors = g_strsplit(buffer, "\n\n", 0);
@@ -87,6 +87,7 @@ init_sysinfo (glibtop *server)
}
g_strfreev(processors);
+ g_free(buffer);
sysinfo.flags = _glibtop_sysdeps_sysinfo;
}

View File

@ -1 +1 @@
de09d5470da7157a9301bdfc4d8cd697 libgtop-2.25.91.tar.bz2
a51ff49eddcce4573f7385e4be33158a libgtop-2.26.0.tar.bz2