diff --git a/.gitignore b/.gitignore index 98ab438..f910e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libgtop-2.28.1.tar.bz2 /libgtop-2.28.2.tar.bz2 /libgtop-2.28.3.tar.bz2 /libgtop-2.28.4.tar.xz +/libgtop-2.28.5.tar.xz diff --git a/0001-fsusage-Fix-fetching-rootfs-stats-on-Fedora-17.patch b/0001-fsusage-Fix-fetching-rootfs-stats-on-Fedora-17.patch deleted file mode 100644 index c235f51..0000000 --- a/0001-fsusage-Fix-fetching-rootfs-stats-on-Fedora-17.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 37774dc02db47f815d3a3da4e51d91c6d3f4bb16 Mon Sep 17 00:00:00 2001 -Message-Id: <37774dc02db47f815d3a3da4e51d91c6d3f4bb16.1360687625.git.crobinso@redhat.com> -From: Cole Robinson -Date: Mon, 28 Jan 2013 23:02:04 +0100 -Subject: [PATCH] fsusage: Fix fetching rootfs stats on Fedora 17 - -When fsusage scans mtab, it matches on the first entry, but since 'rootfs' -isn't of the expected format '/dev/' it bails out. - -Match early on any rootfs entries and skip them. - -Fixes #685897 ---- - sysdeps/linux/fsusage.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sysdeps/linux/fsusage.c b/sysdeps/linux/fsusage.c -index 1356494..b186767 100644 ---- a/sysdeps/linux/fsusage.c -+++ b/sysdeps/linux/fsusage.c -@@ -41,6 +41,10 @@ get_device(glibtop* server, const char *mountpoint, - - while ((mnt = getmntent(fp))) - { -+ /* There can be multiple root mount entries, skip the unuseful one */ -+ if (!strcmp(mnt->mnt_fsname, "rootfs")) -+ continue; -+ - if (!strcmp(mountpoint, mnt->mnt_dir)) { - if (!strncmp(mnt->mnt_fsname, "/dev/", 5)) { - g_strlcpy(device, mnt->mnt_fsname + 5, device_size); --- -1.8.1 - diff --git a/libgtop2.spec b/libgtop2.spec index 0c2f4c9..b033934 100644 --- a/libgtop2.spec +++ b/libgtop2.spec @@ -2,15 +2,14 @@ Name: libgtop2 Summary: LibGTop library (version 2) -Version: 2.28.4 -Release: 5%{?dist} +Version: 2.28.5 +Release: 1%{?dist} License: GPLv2+ URL: http://download.gnome.org/sources/libgtop/2.28 Group: System Environment/Libraries #VCS: git://git.gnome.org/libgtop Source: http://download.gnome.org/sources/libgtop/2.28/libgtop-%{version}.tar.xz -# Fix fetching rootfs stats (bz 871629) -Patch1: 0001-fsusage-Fix-fetching-rootfs-stats-on-Fedora-17.patch + BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: libtool gettext @@ -31,7 +30,6 @@ files to allow you to develop with LibGTop. %prep %setup -q -n libgtop-%{version} -%patch1 -p1 %build %configure --disable-gtk-doc --disable-static @@ -67,6 +65,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %exclude %{_datadir}/info %changelog +* Thu Aug 22 2013 Kalev Lember - 2.28.5-1 +- Update to 2.28.5 + * Sat Aug 03 2013 Fedora Release Engineering - 2.28.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 7fe6c2a..de40631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8aee3c9bde9033303147e993aa1b932 libgtop-2.28.4.tar.xz +3f15032ef2bf06f2b26efd13bc4ae9ab libgtop-2.28.5.tar.xz