[evolution] Keep all GSettings schema files in the main evolution package.

[Matthew Barnes]

commit ea13e4492a74262a04cf287d5665f5cea4c3a349
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Thu Jan 19 09:24:42 2012 -0500

    Keep all GSettings schema files in the main evolution package.

 evolution.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/evolution.spec b/evolution.spec
index 2be43d4..db9f54f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,7 +28,7 @@
 
 Name: evolution
 Version: 3.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -355,6 +355,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
@@ -567,7 +569,6 @@ rm -rf $RPM_BUILD_ROOT
 %files bogofilter
 %defattr(-, root, root)
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 
 %files NetworkManager
 %defattr(-, root, root)
@@ -576,7 +577,6 @@ rm -rf $RPM_BUILD_ROOT
 %files spamassassin
 %defattr(-, root, root)
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 
 %files perl
 %defattr(-, root, root)
@@ -590,6 +590,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 19 2012 Matthew Barnes <mbarnes at redhat.com> - 3.3.4-2
+- Keep all GSettings schema files in the main evolution package, even the
+  ones for the Bogofilter and Spamassassin subpackages, since we just have
+  one .convert file and missing schemas makes gsettings-data-convert crash.
+
 * Mon Jan 16 2012 Milan Crha <mcrha at redhat.com> - 3.3.4-1
 - Update to 3.3.4