From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 26 May 2006 23:46:28 +0000 (+0000)
Subject: - merged deps update and memcorrup patch from AC-branch
X-Git-Tag: auto/th/gconf-editor-2_14_0-5~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgconf-editor.git;a=commitdiff_plain;h=3bf70889e8d4862912bb32d52ccc7249e9bfc511

- merged deps update and memcorrup patch from AC-branch

Changed files:
    gconf-editor.spec -> 1.34
---

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 9399b6a..cce44a3 100644
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -2,24 +2,26 @@ Summary:	An editor for the GConf configuration system
 Summary(pl):	Edytor do systemu konfiguracji GConf
 Name:		gconf-editor
 Version:	2.14.0
-Release:	1
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications
 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
+Patch1:		%{name}-memcorrup.patch
+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
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
+Requires:	libgnomeui >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,6 +33,7 @@ Edytor do systemu konfiguracji GConf.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__intltoolize}