pool/gnome-system-monitor
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-system-monitor?expand=0&rev=33

Browse Source
This commit is contained in:
OBS User unknown 2009-04-24 18:30:09 +00:00 committed by Git OBS Bridge
parent 7017f1491e
commit 5a3000d20f
5 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-system-monitor-2.26.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b78e253e848b0652e76bfacae300e2b02f4f3081e418f3f19aa54fe337ee6f5
size 2217159

3
gnome-system-monitor-2.26.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:856c7460cf2462b46ec119a608ce803bcd567dca5939308566089752544d1687
size 2261345

50
gnome-system-monitor-fate304741.diff
View File

@ -1,9 +1,8 @@
diff --git a/src/Makefile.am b/src/Makefile.am
index 91c81f5..bcb3bc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,8 @@ gnome_system_monitor_SOURCES = \
smooth_refresh.cpp smooth_refresh.h \
Index: gnome-system-monitor-2.26.0.1/src/Makefile.am
===================================================================
--- gnome-system-monitor-2.26.0.1.orig/src/Makefile.am
+++ gnome-system-monitor-2.26.0.1/src/Makefile.am
@@ -25,6 +25,7 @@ gnome_system_monitor_SOURCES = \
defaulttable.h \
disks.cpp disks.h \
hardware.cpp hardware.h \
@ -11,11 +10,10 @@ index 91c81f5..bcb3bc4 100644
selinux.h selinux.cpp \
procman_gnomesu.h procman_gnomesu.cpp \
procman_gksu.h procman_gksu.cpp \
diff --git a/src/acpiview.cpp b/src/acpiview.cpp
new file mode 100644
index 0000000..e0c320e
Index: gnome-system-monitor-2.26.0.1/src/acpiview.cpp
===================================================================
--- /dev/null
+++ b/src/acpiview.cpp
+++ gnome-system-monitor-2.26.0.1/src/acpiview.cpp
@@ -0,0 +1,310 @@
+/* Gnome System Monitor - acpiview.cpp
+ * Copyright (C) 2008 Novell, Inc.
@ -327,11 +325,10 @@ index 0000000..e0c320e
+
+ return vbox;
+}
diff --git a/src/acpiview.h b/src/acpiview.h
new file mode 100644
index 0000000..276c1eb
Index: gnome-system-monitor-2.26.0.1/src/acpiview.h
===================================================================
--- /dev/null
+++ b/src/acpiview.h
+++ gnome-system-monitor-2.26.0.1/src/acpiview.h
@@ -0,0 +1,45 @@
+/* Gnome System Monitor - acpiview.h
+ * Copyright (C) 2008 Novell, Inc.
@ -378,12 +375,11 @@ index 0000000..276c1eb
+GtkWidget* create_acpi_view (AcpiData *);
+
+#endif
diff --git a/src/interface.cpp b/src/interface.cpp
index 61b9bf1..057a77e 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -41,7 +41,8 @@
#include "disks.h"
Index: gnome-system-monitor-2.26.0.1/src/interface.cpp
===================================================================
--- gnome-system-monitor-2.26.0.1.orig/src/interface.cpp
+++ gnome-system-monitor-2.26.0.1/src/interface.cpp
@@ -42,6 +42,7 @@
#include "sysinfo.h"
#include "gsm_color_button.h"
#include "hardware.h"
@ -404,8 +400,8 @@ index 61b9bf1..057a77e 100644
app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -708,6 +709,15 @@ create_main_window (ProcData *procdata)
tab_label3 = gtk_label_new (_("File Systems"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
tab_label4 = gtk_label_new (_("Hardware"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), hardware_box, tab_label4);
+ if (is_thinkpad ())
+ {
@ -419,10 +415,10 @@ index 61b9bf1..057a77e 100644
g_signal_connect (G_OBJECT (notebook), "switch-page",
G_CALLBACK (cb_switch_page), procdata);
g_signal_connect (G_OBJECT (notebook), "change-current-page",
diff --git a/src/procman.h b/src/procman.h
index 9d51eee..c38b681 100644
--- a/src/procman.h
+++ b/src/procman.h
Index: gnome-system-monitor-2.26.0.1/src/procman.h
===================================================================
--- gnome-system-monitor-2.26.0.1.orig/src/procman.h
+++ gnome-system-monitor-2.26.0.1/src/procman.h
@@ -36,6 +36,7 @@
struct ProcInfo;
struct ProcData;
@ -431,7 +427,7 @@ index 9d51eee..c38b681 100644
#include "smooth_refresh.h"
#include "prettytable.h"
@@ -218,6 +219,7 @@ struct ProcData
@@ -216,6 +217,7 @@ struct ProcData
guint64 cpu_total_time;
guint64 cpu_total_time_last;

12
gnome-system-monitor.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Apr 14 15:45:46 CEST 2009 - vuntz@novell.com
- Update to version 2.26.1:
+ Small bugfix about hiding pseudo filesystems.
-------------------------------------------------------------------
Mon Apr 6 11:43:09 CEST 2009 - vuntz@novell.com
- Respin gnome-system-monitor-fate304741.diff that doesn't apply
with new patch package.
-------------------------------------------------------------------
Mon Mar 16 22:51:41 CET 2009 - vuntz@novell.com

12
gnome-system-monitor.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-system-monitor (Version 2.26.0.1)
# spec file for package gnome-system-monitor (Version 2.26.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -37,7 +37,7 @@ BuildRequires: hal-devel
BuildRequires: hwinfo-devel
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.26.0.1
Version: 2.26.1
Release: 1
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM bgo#566962 - hfiguiere@novell.com
@ -111,6 +111,12 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}.lang
%changelog
* Tue Apr 14 2009 vuntz@novell.com
- Update to version 2.26.1:
+ Small bugfix about hiding pseudo filesystems.
* Mon Apr 06 2009 vuntz@novell.com
- Respin gnome-system-monitor-fate304741.diff that doesn't apply
with new patch package.
* Mon Mar 16 2009 vuntz@novell.com
- Update to version 2.26.0.1:
+ Updated translations.
@ -128,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 03 2009 hfiguiere@suse.de
- Update gnome-system-monitor-fate302198.diff to fix slow startup.
(bnc#447370)
* Sun Feb 01 2009 mboman@suse.de
* Mon Feb 02 2009 mboman@suse.de
- Update to version 2.24.4:
+ Fixed license: system-monitor is GPL-2
+ Fixed small memory leak