From 744ec95ea5d33d69de46c2794f5bf95f4f33b932 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Mar 2009 20:40:46 +0000 Subject: [PATCH] 2.26.0 --- .cvsignore | 2 +- libgtop2.spec | 21 ++++++++------------- read-cpuinfo-completely.patch | 26 -------------------------- sources | 2 +- 4 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 read-cpuinfo-completely.patch diff --git a/.cvsignore b/.cvsignore index d997e99..ffdd1c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgtop-2.25.91.tar.bz2 +libgtop-2.26.0.tar.bz2 diff --git a/libgtop2.spec b/libgtop2.spec index 587c3fe..733fb37 100644 --- a/libgtop2.spec +++ b/libgtop2.spec @@ -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 - 2.26.0-1 +- Update to 2.26.0 + * Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/read-cpuinfo-completely.patch b/read-cpuinfo-completely.patch deleted file mode 100644 index 3f657f7..0000000 --- a/read-cpuinfo-completely.patch +++ /dev/null @@ -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; - } diff --git a/sources b/sources index 53acc28..1063ec7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de09d5470da7157a9301bdfc4d8cd697 libgtop-2.25.91.tar.bz2 +a51ff49eddcce4573f7385e4be33158a libgtop-2.26.0.tar.bz2