SPECS (AC-branch): gnome-system-monitor.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 16:46:40 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-system-monitor.spec (1.30 -> 1.30.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-system-monitor.spec
diff -u SPECS/gnome-system-monitor.spec:1.30 SPECS/gnome-system-monitor.spec:1.30.2.1
--- SPECS/gnome-system-monitor.spec:1.30	Tue Nov 29 18:06:39 2005
+++ SPECS/gnome-system-monitor.spec	Mon May 15 18:46:35 2006
@@ -2,24 +2,26 @@
 Summary:	Simple process monitor
 Summary(pl):	Prosty monitor procesów
 Name:		gnome-system-monitor
-Version:	2.12.2
+Version:	2.14.2
 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:	0db673018a07a5fb5da6c1715f366382
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.10.0
+BuildRequires:	GConf2-devel >= 2.14.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:	libgnomeui-devel >= 2.11.1
-BuildRequires:	libgtop-devel >= 1:2.12.0
+BuildRequires:	libgksu-devel >= 0.15.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libgtop-devel >= 1:2.14.0
 BuildRequires:	libselinux-devel
-BuildRequires:	libwnck-devel >= 2.11.91
+BuildRequires:	libwnck-devel >= 2.14.1
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
@@ -57,8 +59,6 @@
 	omf_dest_dir=%{_omf_dest_dir}/%{name} \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name} --with-gnome
 
 %clean
@@ -87,6 +87,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30.2.1  2006/05/15 16:46:35  baggins
+- merged from HEAD
+
+Revision 1.35  2006/05/10 20:18:03  freetz
+- 2.14.2
+
+Revision 1.34  2006/04/10 17:12:50  freetz
+- 2.14.1
+
+Revision 1.33  2006/04/02 14:58:13  freetz
+- merged from DEVEL
+
+Revision 1.32.2.3  2006/03/13 14:09:29  freetz
+- 2.14.0
+
+Revision 1.32.2.2  2006/02/28 08:34:42  freetz
+- 2.13.92
+
+Revision 1.32.2.1  2006/02/01 21:10:04  freetz
+- 2.13.90
+
+Revision 1.32  2006/01/05 23:34:33  freetz
+- we have autodeps for this, reverted last improvement
+
+Revision 1.31  2006/01/05 21:59:58  emes
+- requires libgtop
+
 Revision 1.30  2005/11/29 17:06:39  freetz
 - 2.12.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-system-monitor.spec?r1=1.30&r2=1.30.2.1&f=u