From 4b4690d64b9dfec245fe431afe904601c5d616c3 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Dec 2009 18:21:46 +0000 Subject: [PATCH] Disable bogofilter subpackage if EL6+ --- evolution.spec | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/evolution.spec b/evolution.spec index bde4aa4..2da5170 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,6 @@ +# Variable must exist even if unused +%{?!rhel:%define rhel 0} + %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 @@ -192,6 +195,8 @@ This package contains conduits for synchronizing PalmPilot or other PalmOS devices with %{name}. %endif +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution @@ -200,6 +205,7 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. +%endif %package spamassassin Group: Applications/Productivity @@ -367,6 +373,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ +rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug +rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%endif + %pre if [ "$1" -gt 1 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -381,9 +394,12 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %pre bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +%endif %post /sbin/ldconfig @@ -402,9 +418,12 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %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 || : +%endif %preun if [ "$1" -eq 0 ] ; then @@ -420,11 +439,14 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %preun bogofilter if [ "$1" -eq 0 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : fi +%endif %postun /sbin/ldconfig @@ -660,11 +682,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %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 +%endif %files spamassassin %defattr(-, root, root) @@ -684,6 +709,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Dec 02 2009 Warren Togami - 2.29.3-1 +- Disable bogofilter subpackage if EL6+ + * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 - Add patch for missing m4 files from tarball.