From e6f3621fb314fc8e40184d04e42194cad624cc62 Mon Sep 17 00:00:00 2001
From: freetz <freetz@pld-linux.org>
Date: Mon, 7 Aug 2006 20:36:54 +0000
Subject: [PATCH] - 2.15.91, scrollkeeper stuff removed upstream, updated BR /
 file list,   double free fix already included

Changed files:
    gconf-editor.spec -> 1.37
---
 gconf-editor.spec | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/gconf-editor.spec b/gconf-editor.spec
index c21c10c..980ad69 100644
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,28 +1,28 @@
 Summary:	An editor for the GConf configuration system
 Summary(pl):	Edytor do systemu konfiguracji GConf
 Name:		gconf-editor
-Version:	2.14.0
-Release:	6
+Version:	2.15.91
+Release:	1
 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
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.15/%{name}-%{version}.tar.bz2
+# Source0-md5:	5b46ca0f177428b6c84c53cebd81831e
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-memcorrup.patch
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gtk+2-devel >= 2:2.9.3
-BuildRequires:	libgnomeui-devel >= 2.15.1
+BuildRequires:	gnome-doc-utils >= 0.7.1
+BuildRequires:	gtk+2-devel >= 2:2.10.1
+BuildRequires:	libgnomeui-devel >= 2.15.91
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2 >= 2.14.0
-Requires(post,postun):	gtk+2 >= 2:2.9.3
-Requires(post,postun):	scrollkeeper
+Requires(post,postun):	gtk+2 >= 2:2.10.1
 Requires:	libgnomeui >= 2.14.0
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +34,6 @@ Edytor do systemu konfiguracji GConf.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 %build
 %{__intltoolize}
@@ -52,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{no,ug}
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ug
 
 %find_lang %{name} --with-gnome
 
@@ -61,15 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install gconf-editor.schemas
-%scrollkeeper_update_post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall gconf-editor.schemas
 
 %postun
-%scrollkeeper_update_postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -78,6 +75,5 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %{_desktopdir}/*
 %{_iconsdir}/hicolor/*/*/*.png
 %{_mandir}/man1/*
-%{_omf_dest_dir}/%{name}
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/gconf-editor.schemas
-- 
2.44.0