SPECS: GConf2.spec - merged from DEVEL

[patrys]

Author: patrys                       Date: Tue Mar 17 15:29:56 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   GConf2.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: SPECS/GConf2.spec
diff -u SPECS/GConf2.spec:1.138 SPECS/GConf2.spec:1.139
--- SPECS/GConf2.spec:1.138	Fri Dec 26 17:56:43 2008
+++ SPECS/GConf2.spec	Tue Mar 17 16:29:50 2009
@@ -11,25 +11,25 @@
 Summary(pt_BR.UTF-8):	Sistema de Configuração do GNOME 2
 Summary(ru.UTF-8):	Система конфигурации GNOME 2
 Name:		GConf2
-Version:	2.24.0
-Release:	2
+Version:	2.26.0
+Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.24/GConf-%{version}.tar.bz2
-# Source0-md5:	4971d96f5ba94fe4a69396267bd5afe8
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-%{version}.tar.bz2
+# Source0-md5:	b010f0de356ea093c6a73778b13de956
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
-Patch1:		%{name}-path.patch
-Patch2:		%{name}-reload.patch
+Patch1:		%{name}-reload.patch
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	PolicyKit-devel >= 0.9
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
-BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	glib2-devel >= 1:2.19.0
+BuildRequires:	gtk+2-devel >= 2:2.15.0
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	openldap-devel >= 2.4.6
@@ -64,7 +64,7 @@
 Summary(pl.UTF-8):	Biblioteka współdzielona GConf2
 Group:		Libraries
 Requires:	ORBit2 >= 1:2.14.9
-Requires:	glib2 >= 1:2.18.0
+Requires:	glib2 >= 1:2.19.0
 Conflicts:	GConf2 < 2.24.0-2
 
 %description libs
@@ -83,6 +83,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	ORBit2-devel >= 1:2.14.9
+Requires:	dbus-devel >= 1.0.0
 Requires:	libxml2-devel >= 1:2.6.30
 Obsoletes:	libGConf2-devel
 
@@ -162,7 +163,6 @@
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -183,7 +183,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gconf/schemas}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gconf/{schemas,gconf.xml.system}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -281,6 +281,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2009/03/17 15:29:50  patrys
+- merged from DEVEL
+
+Revision 1.138.2.3  2009/03/17 15:27:51  patrys
+- 2.26.0
+
+Revision 1.138.2.2  2009/02/18 19:24:55  megabajt
+- removed -path.patch (GNOME 1 is not supported in Th)
+- provide /etc/gconf/gconf.xml.system directory
+
+Revision 1.138.2.1  2009/02/18 11:25:11  megabajt
+- updated to 2.25.2
+
 Revision 1.138  2008/12/26 16:56:43  qboosh
 - separated -libs (libgconf-2 + gconftool-2) to allow development without
   installing daemons or suids (dbus and policykit)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/GConf2.spec?r1=1.138&r2=1.139&f=u