From e13a21f4e5cd5fcf0a205faf3ab756df6b0c1369 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Oct 06 2006 17:20:15 +0000 Subject: fix an issue with error handling --- diff --git a/GConf2.spec b/GConf2.spec index 83a2ced..53b73d2 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -5,7 +5,7 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.14.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -24,8 +24,9 @@ BuildRequires: gettext BuildRequires: openldap-devel Patch0: GConf2-2.8.1-reload.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=356573 +http://bugzilla.gnome.org/show_bug.cgi?id=356573 Patch1: GConf2-2.14.0-timeout.patch +Patch2: GConf2-2.14.0-errors.patch %description GConf is a process-transparent configuration database API used to @@ -39,6 +40,7 @@ Requires: %{name} = %{version} Requires: libxml2-devel >= %{libxml2_version} Requires: ORBit2-devel >= %{orbit2_version} Requires: glib2-devel >= %{glib2_version} +Requires: pkgconfig %description devel @@ -48,7 +50,8 @@ development using GConf. %prep %setup -q -n GConf-%{version} %patch0 -p1 -b .reload -%patch1 -p1 -b .timeout +%patch1 -p1 -b .timers +%patch2 -p1 -b .errors %build %configure @@ -96,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_libdir}/*.a %{_libdir}/*.so %{_includedir}/gconf %{_datadir}/aclocal/*.m4 @@ -104,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Fri Oct 6 2006 Matthias Clasen - 2.14.0-4 +- Fix an issue with error reporting (#202549) +- Don't ship static libraries +- Require pkgconfig for the -devel package + * Mon Sep 18 2006 Matthias Clasen - 2.14.0-3 - Make sure that gconfd dies shortly after the session ends