- merged from DEVEL

Changed files:
    gnome-system-monitor-desktop.patch -> 1.4
    gnome-system-monitor.spec -> 1.33

diff --git a/gnome-system-monitor-desktop.patch b/gnome-system-monitor-desktop.patch
index 9e1fed59a404c5b38a5e292e9e23da70cb35d9a0..0843f604093ede8cf967a77d6f73eed0d41f3270 100644 (file)
--- a/gnome-system-monitor-desktop.patch
+++ b/gnome-system-monitor-desktop.patch
@@ -1,11 +1,11 @@
-diff -aurN gnome-system-monitor-2.12.2.orig/gnome-system-monitor.desktop.in.in gnome-system-monitor-2.12.2/gnome-system-monitor.desktop.in.in
---- gnome-system-monitor-2.12.2.orig/gnome-system-monitor.desktop.in.in        2005-11-29 09:32:19.000000000 +0100
-+++ gnome-system-monitor-2.12.2/gnome-system-monitor.desktop.in.in     2005-11-29 18:05:02.000000000 +0100
+diff -aurN gnome-system-monitor-2.13.90.orig/gnome-system-monitor.desktop.in.in gnome-system-monitor-2.13.90/gnome-system-monitor.desktop.in.in
+--- gnome-system-monitor-2.13.90.orig/gnome-system-monitor.desktop.in.in       2006-01-29 20:05:56.000000000 +0100
++++ gnome-system-monitor-2.13.90/gnome-system-monitor.desktop.in.in    2006-02-01 21:53:23.361476000 +0100
 @@ -8,7 +8,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
--Categories=Application;System;Monitor;X-Red-Hat-Base
+-Categories=GNOME;GTK;Application;System;Monitor;X-Red-Hat-Base;
 +Categories=GTK;GNOME;System;Monitor;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=system-monitor

diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index e4bbc061566d29a1d8d432a4dc51bf3885fb239b..f471797a232dd2f51ba2a5ddb805366369632fda 100644 (file)
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,28 +1,29 @@
 Summary:       Simple process monitor
 Summary(pl):   Prosty monitor procesów
 Name:          gnome-system-monitor
-Version:       2.12.2
+Version:       2.14.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 100f3599b95a375db85df521f3e2554e
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 4d718e9dff62bb69fcb9d405a1022426
 Patch0:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.10.0
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: glib2-devel >= 1:2.9.1
 BuildRequires: gnome-common >= 2.8.0-2
 BuildRequires: gnome-vfs2-devel >= 2.11.0
 BuildRequires: gtk+2-devel >= 2:2.8.0
+BuildRequires: libgksu-devel >= 0.15.0
 BuildRequires: libgnomeui-devel >= 2.11.1
-BuildRequires: libgtop-devel >= 1:2.12.0
+BuildRequires: libgtop-devel >= 1:2.14.0
 BuildRequires: libselinux-devel
 BuildRequires: libwnck-devel >= 2.11.91
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
-BuildRequires: xft-devel >= 2.1-2
 Requires(post,preun):  GConf2
 Requires(post,postun): scrollkeeper
 Obsoletes:     procman