- Split junk filtering plugins into evolution-bogofilter and

evolution-spamassassin subpackages, each of which requires the
    necessary backend packages. (RH bug #377381)

evolution.spec

@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.21.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -55,9 +55,6 @@ Source: evolution-%{version}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
-Provides: evolution-bogofilter = %{version}-%{release}
-Obsoletes: evolution-bogofilter <= 0.2.0-5
-
 ### Patches ###
 
 # bad hack
@@ -225,10 +222,28 @@ Requires: %{name} = %{version}-%{release}
 Requires: gnome-pilot >= %{gnome_pilot_version}
 
 %description conduits
-The package contains conduits for synchronizing PalmPilot<tm> or other
+This package contains conduits for synchronizing PalmPilot<tm> or other
 PalmOS<tm> devices with %{name}.
 %endif
 
+%package bogofilter
+Group: Applications/Productivity
+Summary: Bogofilter plugin for Evolution
+Requires: %{name} = %{version}-%{release}
+Requires: bogofilter
+
+%description bogofilter
+This package contains the plugin to filter junk mail using Bogofilter.
+
+%package spamassassin
+Group: Applications/Productivity
+Summary: SpamAssassin plugin for Evolution
+Requires: %{name} = %{version}-%{release}
+Requires: spamassassin
+
+%description spamassassin
+This package contains the plugin to filter junk mail using SpamAssassin.
+
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
@@ -396,9 +411,12 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
+%post bogofilter
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
+
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -419,7 +437,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
-%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 # The main executable
@@ -513,9 +530,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-audio-inline.so
 %endif
 
-%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
-%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
-
 %{evo_plugin_dir}/org-gnome-calendar-file.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-file.so
 
@@ -599,9 +613,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-print-message.so
 %{evo_plugin_dir}/org-gnome-print-message.xml
 
-%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
-%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
-
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
@@ -671,7 +682,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
+%files bogofilter
+%defattr(-, root, root)
+%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
+%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
+%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+
+%files spamassassin
+%defattr(-, root, root)
+%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
+%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
+
 %changelog
+* Mon Dec 10 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-4.fc9
+- Split junk filtering plugins into evolution-bogofilter and
+  evolution-spamassassin subpackages, each of which requires the
+  necessary backend packages.  (RH bug #377381)
+
 * Mon Dec 05 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-3.fc9
 - Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3.