SPECS (AC-branch): gnome-keyring-manager.spec - merged from HEAD

[baggins]

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

---- Files affected:
SPECS:
   gnome-keyring-manager.spec (1.11 -> 1.11.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-keyring-manager.spec
diff -u SPECS/gnome-keyring-manager.spec:1.11 SPECS/gnome-keyring-manager.spec:1.11.2.1
--- SPECS/gnome-keyring-manager.spec:1.11	Wed Sep  7 19:39:10 2005
+++ SPECS/gnome-keyring-manager.spec	Mon May 15 18:19:46 2006
@@ -2,15 +2,15 @@
 Summary:	Keyring manager for GNOME
 Summary(pl):	Zarządzanie kluczami dla GNOME
 Name:		gnome-keyring-manager
-Version:	2.12.0
-Release:	2
+Version:	2.14.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	0a588c64839390e0c6e07250b509a86a
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	d4e38c7b7da99885fa898917e10d8aeb
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-doc-utils >= 0.4.0
@@ -18,7 +18,7 @@
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	intltool >= 0.34
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2
@@ -88,6 +88,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11.2.1  2006/05/15 16:19:46  baggins
+- merged from HEAD
+
+Revision 1.12  2006/03/12 22:25:57  freetz
+- 2.14.0
+
 Revision 1.11  2005/09/07 17:39:10  freetz
 - BR ac/am, full configure rebuild, rel.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.11&r2=1.11.2.1&f=u