From 11779e2081058af380bde49406f99c1514e1effd Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: May 17 2011 09:45:18 +0000
Subject: Revert part of previous change around libevolution-mail-settings


---

diff --git a/evolution.spec b/evolution.spec
index 85b1dfe..9c6a65f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,7 +28,7 @@
 
 Name: evolution
 Version: 3.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -304,7 +304,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 # belong on a GNOME 3 desktop.
 rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings
 rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop
-rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so*
 
 %find_lang evolution-%{evo_base_version} --all-name --with-gnome
 
@@ -455,6 +454,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.*
 %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.*
 %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.*
 %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.*
 %{_libdir}/evolution/%{evo_base_version}/libfilter.so.*
 %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.*
@@ -586,6 +586,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so
 %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so
 %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so
 %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so
 %{_libdir}/evolution/%{evo_base_version}/libfilter.so
 %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so
@@ -623,6 +624,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue May 17 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-3
+- Keep libevolution-mail-settings.so* from the previous change,
+  it is still used by other parts of evolution.
+
 * Mon May 09 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.1-2
 - Drop the "Email Settings" capplet.