- 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 9399b6a70348bf5fbfc6e594e6fdc4ef2351ac3b..cce44a38da9a26aec63a36b1e1a73bc8c1cdd052 100644 (file)
--- 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
 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
 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: 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
 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -31,6 +33,7 @@ Edytor do systemu konfiguracji GConf.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p0

 
 %build
 %{__intltoolize}
 
 %build
 %{__intltoolize}