From 61002b6c41e2f71f5687b5f72a1065205bd306a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Jul 2009 16:44:13 +0000 Subject: [PATCH] - Move libeconduit.so into the conduits subpackage to see if that untangles us from gnome-pilot. --- evolution.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index d7293b9..8ef9686 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -124,11 +124,11 @@ BuildRequires: openssl-devel BuildRequires: gstreamer-devel %endif -%if %{ldap_support} +%if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{build_conduits} +%if %{build_conduits} BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} %endif @@ -465,7 +465,6 @@ rm -rf $RPM_BUILD_ROOT # Shared libraries: %{_libdir}/evolution/%{evo_major}/libeabutil.so.* -%{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* %{_libdir}/evolution/%{evo_major}/libefilterbar.so.* @@ -658,6 +657,7 @@ rm -rf $RPM_BUILD_ROOT %files conduits %defattr(-, root, root) %dir %{_libdir}/evolution/%{evo_major}/conduits +%{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so @@ -693,6 +693,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 28 2009 Matthew Barnes - 2.27.5-2.fc12 +- Move libeconduit.so into the conduits subpackage to see if that + untangles us from gnome-pilot. + * Mon Jul 27 2009 Milan Crha - 2.27.5-1.fc12 - Update to 2.27.5 - Remove pst import plugin patch (fixed upstream).