SPECS (AC-branch): gconf-editor.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 13:59:37 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gconf-editor.spec (1.31 -> 1.31.2.1) 

---- Diffs:

================================================================
Index: SPECS/gconf-editor.spec
diff -u SPECS/gconf-editor.spec:1.31 SPECS/gconf-editor.spec:1.31.2.1
--- SPECS/gconf-editor.spec:1.31	Wed Sep  7 12:50:14 2005
+++ SPECS/gconf-editor.spec	Mon May 15 15:59:32 2006
@@ -2,19 +2,19 @@
 Summary:	An editor for the GConf configuration system
 Summary(pl):	Edytor do systemu konfiguracji GConf
 Name:		gconf-editor
-Version:	2.12.0
+Version:	2.14.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	ec8b0d4ee2a460ed31f69e4825fb4e17
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	eb8b979464f6e383e5a27b57ee4e8382
 Patch0:		%{name}-desktop.patch
-BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common >= 2.4.0
 BuildRequires:	gtk+2-devel >= 2:2.8.3
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -34,7 +34,8 @@
 %patch0 -p1
 
 %build
-gnome-doc-common
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -82,6 +83,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31.2.1  2006/05/15 13:59:32  baggins
+- merged from HEAD
+
+Revision 1.33  2006/04/02 15:27:05  freetz
+- merged from DEVEL
+
+Revision 1.32.2.2  2006/03/12 22:24:52  freetz
+- 2.14.0
+
+Revision 1.32.2.1  2006/01/30 16:45:59  freetz
+- 2.13.90
+
+Revision 1.32  2005/11/30 17:50:25  freetz
+- 2.12.1
+
 Revision 1.31  2005/09/07 10:50:14  paladine
 - merged from DEVEL and updated to 2.12.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gconf-editor.spec?r1=1.31&r2=1.31.2.1&f=u