From 43afe854a2f92384fae78cc24a22d7f9f2dd1a04 Mon Sep 17 00:00:00 2001
From: kloczek <kloczek@pld-linux.org>
Date: Sat, 7 Sep 2002 05:29:38 +0000
Subject: [PATCH 1/1] - merge unlock-dialog patch from rawhide (add dialog to
 offer to delete   gconf locks).

Changed files:
    GConf2.spec -> 1.28
---
 GConf2.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/GConf2.spec b/GConf2.spec
index debe2c3..22ce1cd 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -10,6 +10,7 @@ Source0:	ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/GConf/GConf-%{version}
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
 Patch1:		%{name}-am.patch
 Patch2:		%{name}-path.patch
+Patch3:		%{name}-unlock-dialog.patch
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit2-devel
 BuildRequires:	bonobo-activation-devel >= 1.0.3
@@ -85,11 +86,12 @@ Bibliotecas est
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 rm -f missing acinclude.m4
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
@@ -101,13 +103,14 @@ aclocal
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_sysconfdir}/gconf/schemas}
-install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir} \
 	HTML_DIR=%{_gtkdocdir} 
 	
+install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
+
 %find_lang %{name}
 
 %clean
-- 
2.44.0