diff --git a/.cvsignore b/.cvsignore index 5fb4e35..a61e793 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-system-monitor-2.23.6.tar.bz2 +gnome-system-monitor-2.23.90.tar.bz2 diff --git a/gnome-system-monitor-2.23.2-polkit.patch b/gnome-system-monitor-2.23.90-polkit.patch similarity index 92% rename from gnome-system-monitor-2.23.2-polkit.patch rename to gnome-system-monitor-2.23.90-polkit.patch index 98f6f50..dff447d 100644 --- a/gnome-system-monitor-2.23.2-polkit.patch +++ b/gnome-system-monitor-2.23.90-polkit.patch @@ -1,17 +1,18 @@ -diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2.23.2/configure.in ---- gnome-system-monitor-2.23.2/configure.in.polkit 2008-05-24 19:13:03.000000000 -0400 -+++ gnome-system-monitor-2.23.2/configure.in 2008-05-27 23:41:26.000000000 -0400 -@@ -33,10 +33,42 @@ GTKMM_REQUIRED=2.8 - GIOMM_REQUIRED=2.16.0 +diff -up gnome-system-monitor-2.23.90/configure.in.polkit gnome-system-monitor-2.23.90/configure.in +--- gnome-system-monitor-2.23.90/configure.in.polkit 2008-08-18 11:25:22.000000000 -0400 ++++ gnome-system-monitor-2.23.90/configure.in 2008-08-22 23:24:58.000000000 -0400 +@@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0 GLIBMM_REQUIRED=2.14 LIBXML_REQUIRED=2.0 + RSVG_REQUIRED=2.12 +-DBUS_REQUIRED=0.7 +POLKIT_GNOME_REQUIRED=0.7 +POLKIT_DBUS_REQUIRED=0.7 +DBUS_GLIB_REQUIRED=0.71 +DBUS_REQUIRED=1.1.2 - RSVG_REQUIRED=2.12 ++ - PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED) + PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) +# PolicyKit detection; defaults to 'auto' (use it if it's available) +# @@ -40,11 +41,10 @@ diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2. +AC_SUBST(POLKIT_GNOME_LIBS) +AC_SUBST(POLKIT_DBUS_CFLAGS) +AC_SUBST(POLKIT_DBUS_LIBS) -+ AC_ARG_ENABLE(more-warnings, [AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings])], -@@ -96,6 +128,7 @@ Configuration: +@@ -98,6 +129,7 @@ Configuration: C++ Compiler: ${CXX} CFLAGS: ${CFLAGS} CXXFLAGS: ${CXXFLAGS} @@ -52,9 +52,9 @@ diff -up gnome-system-monitor-2.23.2/configure.in.polkit gnome-system-monitor-2. Maintainer mode: ${USER_MAINTAINER_MODE} Languages: ${ALL_LINGUAS} " -diff -up gnome-system-monitor-2.23.2/po/POTFILES.in.polkit gnome-system-monitor-2.23.2/po/POTFILES.in ---- gnome-system-monitor-2.23.2/po/POTFILES.in.polkit 2008-05-24 19:20:25.000000000 -0400 -+++ gnome-system-monitor-2.23.2/po/POTFILES.in 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/po/POTFILES.in.polkit gnome-system-monitor-2.23.90/po/POTFILES.in +--- gnome-system-monitor-2.23.90/po/POTFILES.in.polkit 2008-08-18 12:15:12.000000000 -0400 ++++ gnome-system-monitor-2.23.90/po/POTFILES.in 2008-08-22 23:22:17.000000000 -0400 @@ -8,6 +8,7 @@ src/callbacks.cpp src/defaulttable.h src/disks.cpp @@ -63,9 +63,9 @@ diff -up gnome-system-monitor-2.23.2/po/POTFILES.in.polkit gnome-system-monitor- src/gnome-system-monitor.schemas.in src/gsm_color_button.c src/interface.cpp -diff -up gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit gnome-system-monitor-2.23.2/src/callbacks.cpp ---- gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit 2008-04-22 17:55:31.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/callbacks.cpp 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/callbacks.cpp.polkit gnome-system-monitor-2.23.90/src/callbacks.cpp +--- gnome-system-monitor-2.23.90/src/callbacks.cpp.polkit 2008-04-22 17:55:31.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/callbacks.cpp 2008-08-22 23:22:17.000000000 -0400 @@ -37,25 +37,21 @@ #include "disks.h" #include "lsof.h" @@ -108,9 +108,9 @@ diff -up gnome-system-monitor-2.23.2/src/callbacks.cpp.polkit gnome-system-monit static void change_gconf_color(GConfClient *client, const char *key, -diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.c ---- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.c 2008-05-27 23:41:26.000000000 -0400 +diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.c +--- /dev/null 2008-08-22 21:13:59.064267460 -0400 ++++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.c 2008-08-22 23:22:17.000000000 -0400 @@ -0,0 +1,640 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -752,9 +752,9 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanis +out: + return ret; +} -diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.xml ---- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanism.xml 2008-05-27 23:41:26.000000000 -0400 +diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.xml +--- /dev/null 2008-08-22 21:13:59.064267460 -0400 ++++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.xml 2008-08-22 23:22:17.000000000 -0400 @@ -0,0 +1,15 @@ + + @@ -771,9 +771,9 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/gnome-system-monitor-mechanis + + + -diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monitor-2.23.2/src/interface.cpp ---- gnome-system-monitor-2.23.2/src/interface.cpp.polkit 2008-02-25 14:30:29.000000000 -0500 -+++ gnome-system-monitor-2.23.2/src/interface.cpp 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/interface.cpp.polkit gnome-system-monitor-2.23.90/src/interface.cpp +--- gnome-system-monitor-2.23.90/src/interface.cpp.polkit 2008-02-25 14:30:29.000000000 -0500 ++++ gnome-system-monitor-2.23.90/src/interface.cpp 2008-08-22 23:22:17.000000000 -0400 @@ -30,6 +30,10 @@ #include #include @@ -927,9 +927,9 @@ diff -up gnome-system-monitor-2.23.2/src/interface.cpp.polkit gnome-system-monit } static void -diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor-2.23.2/src/Makefile.am ---- gnome-system-monitor-2.23.2/src/Makefile.am.polkit 2008-03-18 17:37:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/Makefile.am 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/Makefile.am.polkit gnome-system-monitor-2.23.90/src/Makefile.am +--- gnome-system-monitor-2.23.90/src/Makefile.am.polkit 2008-08-08 15:55:59.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/Makefile.am 2008-08-22 23:22:17.000000000 -0400 @@ -4,7 +4,9 @@ INCLUDES = \ -DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -1000,9 +1000,9 @@ diff -up gnome-system-monitor-2.23.2/src/Makefile.am.polkit gnome-system-monitor CLEANFILES = \ $(schema_DATA) -diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf ---- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.conf 2008-05-27 23:41:26.000000000 -0400 +diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.conf +--- /dev/null 2008-08-22 21:13:59.064267460 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.conf 2008-08-22 23:22:17.000000000 -0400 @@ -0,0 +1,11 @@ + + @@ -1015,17 +1015,17 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mecha + + + -diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in ---- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-05-27 23:41:26.000000000 -0400 +diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.service.in +--- /dev/null 2008-08-22 21:13:59.064267460 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-08-22 23:22:17.000000000 -0400 @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.gnome.SystemMonitor.Mechanism +Exec=libexecdir/gnome-system-monitor-mechanism +User=root -diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in ---- /dev/null 2008-05-27 15:05:00.929008040 -0400 -+++ gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.policy.in 2008-05-27 23:41:26.000000000 -0400 +diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.policy.in +--- /dev/null 2008-08-22 21:13:59.064267460 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.policy.in 2008-08-22 23:22:17.000000000 -0400 @@ -0,0 +1,50 @@ + + @@ -1077,9 +1077,9 @@ diff -up /dev/null gnome-system-monitor-2.23.2/src/org.gnome.system-monitor.poli + + + -diff -up gnome-system-monitor-2.23.2/src/procactions.cpp.polkit gnome-system-monitor-2.23.2/src/procactions.cpp ---- gnome-system-monitor-2.23.2/src/procactions.cpp.polkit 2007-01-02 17:15:36.000000000 -0500 -+++ gnome-system-monitor-2.23.2/src/procactions.cpp 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/procactions.cpp.polkit gnome-system-monitor-2.23.90/src/procactions.cpp +--- gnome-system-monitor-2.23.90/src/procactions.cpp.polkit 2007-01-02 17:15:36.000000000 -0500 ++++ gnome-system-monitor-2.23.90/src/procactions.cpp 2008-08-22 23:22:17.000000000 -0400 @@ -31,6 +31,10 @@ #include "procdialogs.h" #include "callbacks.h" @@ -1192,9 +1192,9 @@ diff -up gnome-system-monitor-2.23.2/src/procactions.cpp.polkit gnome-system-mon proctable_update_all (procdata); } + -diff -up gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit gnome-system-monitor-2.23.2/src/procdialogs.cpp ---- gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procdialogs.cpp 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/procdialogs.cpp.polkit gnome-system-monitor-2.23.90/src/procdialogs.cpp +--- gnome-system-monitor-2.23.90/src/procdialogs.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procdialogs.cpp 2008-08-22 23:22:17.000000000 -0400 @@ -35,6 +35,11 @@ #include "procman_gnomesu.h" #include "procman_gksu.h" @@ -1388,9 +1388,9 @@ diff -up gnome-system-monitor-2.23.2/src/procdialogs.cpp.polkit gnome-system-mon } static void -diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor-2.23.2/src/procman.cpp ---- gnome-system-monitor-2.23.2/src/procman.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procman.cpp 2008-05-27 23:41:26.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/procman.cpp.polkit gnome-system-monitor-2.23.90/src/procman.cpp +--- gnome-system-monitor-2.23.90/src/procman.cpp.polkit 2008-07-21 12:18:47.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procman.cpp 2008-08-22 23:22:17.000000000 -0400 @@ -34,6 +34,10 @@ #include #include @@ -1438,9 +1438,9 @@ diff -up gnome-system-monitor-2.23.2/src/procman.cpp.polkit gnome-system-monitor ProcData* ProcData::get_instance() -diff -up gnome-system-monitor-2.23.2/src/procman.h.polkit gnome-system-monitor-2.23.2/src/procman.h ---- gnome-system-monitor-2.23.2/src/procman.h.polkit 2008-05-24 17:58:27.000000000 -0400 -+++ gnome-system-monitor-2.23.2/src/procman.h 2008-05-28 00:08:43.000000000 -0400 +diff -up gnome-system-monitor-2.23.90/src/procman.h.polkit gnome-system-monitor-2.23.90/src/procman.h +--- gnome-system-monitor-2.23.90/src/procman.h.polkit 2008-05-24 17:58:27.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procman.h 2008-08-22 23:22:17.000000000 -0400 @@ -33,6 +33,11 @@ #include #include diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index d1a7152..4cbc063 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -12,8 +12,8 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.23.6 -Release: 2%{?dist} +Version: 2.23.90 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ @@ -43,7 +43,7 @@ BuildRequires: gnome-common BuildRequires: autoconf, automake, libtool # sent upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462 -Patch0: gnome-system-monitor-2.23.2-polkit.patch +Patch0: gnome-system-monitor-2.23.90-polkit.patch # sent upstream: http://bugzilla.gnome.org/show_bug.cgi?id=421912 Patch1: session.patch @@ -126,6 +126,9 @@ scrollkeeper-update -q %changelog +* Fri Aug 22 2008 Matthias Clasen - 2.23.90-1 +- Update to 2.23.90 + * Wed Aug 13 2008 Matthias Clasen - 2.23.6-2 - Add session mgmt information in a Session column diff --git a/sources b/sources index 50e8177..36a436d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc7e7e252465948b122e267713bba4a0 gnome-system-monitor-2.23.6.tar.bz2 +6f19bc3a4a1a210892bbed9aa1fde676 gnome-system-monitor-2.23.90.tar.bz2