diff --git a/GConf2.spec b/GConf2.spec index 26d35ec..2ef741b 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -1,11 +1,11 @@ %define libxml2_version 2.4.12 -%define orbit2_version 2.6.0 +%define orbit2_version 2.6.0 %define glib2_version 2.2.0 Summary: A process-transparent configuration system Name: GConf2 Version: 2.2.0 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -18,12 +18,15 @@ BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk-doc >= 0.9 BuildRequires: pkgconfig >= 0.14 +BuildRequires: libtool ## this is the original unlock-dialog-only patch Patch1: gconf-1.2.1-unlock-dialog.patch ## this is what we're using now, with GCONF_LOCAL_LOCKS ## if it breaks, back down to patch1 Patch2: gconf-2.1.90-locks.patch +#### in CVS we have gconf-2.3.0-locks.patch which is the final patch in CVS +#### with linc_get_tmpdir() %description GConf is a process-transparent configuration database API used to @@ -53,11 +56,11 @@ development using GConf. %build %configure -make ## %{?_smp_mflags} +make LIBTOOL=/usr/bin/libtool ## %{?_smp_mflags} %install rm -fr $RPM_BUILD_ROOT -%makeinstall +%makeinstall LIBTOOL=/usr/bin/libtool chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.defaults chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.mandatory @@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Tue Apr 8 2003 Matt Wilson 2.2.0-2 +- use system libtool (#88338) + * Tue Feb 4 2003 Havoc Pennington 2.2.0-1 - 2.2.0