From abd1452497de6c051d80150e16668ed666d8379a Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 19 Jan 2006 04:58:56 +0000 Subject: [PATCH] - fix multilib issue with shlib bonobo components (bug 156982) --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index e246fdc..690b6c4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 8 +Release: 9 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -349,7 +349,9 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution - +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done %find_lang %name-%{evo_major} %post @@ -512,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Jan 18 2006 Ray Strode - 2.5.4-9 +- fix multilib issue with shlib bonobo components (bug 156982) + * Thu Jan 12 2006 David Malcolm - 2.5.4-8 - avoid multiple initialization of NetworkManager connections (patch 807, gnome bug #326875)