rpms/evolution/devel evolution.spec,1.406,1.407

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5976

Modified Files:
	evolution.spec 
Log Message:

* Tue Jul 28 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.5-2.fc12
- Move libeconduit.so into the conduits subpackage to see if that
  untangles us from gnome-pilot.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- evolution.spec	27 Jul 2009 16:13:14 -0000	1.406
+++ evolution.spec	28 Jul 2009 16:44:13 -0000	1.407
@@ -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 <mbarnes at redhat.com> - 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 <mcrha at redhat.com> - 2.27.5-1.fc12
 - Update to 2.27.5
 - Remove pst import plugin patch (fixed upstream).