rpms/evolution/F-12 evolution.spec,1.419,1.420

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485

Modified Files:
	evolution.spec 
Log Message:
Disable bogofilter subpackage if EL6+



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- evolution.spec	19 Oct 2009 09:52:52 -0000	1.419
+++ evolution.spec	2 Dec 2009 18:24:54 -0000	1.420
@@ -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
@@ -43,7 +46,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -196,6 +199,8 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -204,6 +209,7 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
+%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -385,6 +391,13 @@ done
 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
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -401,9 +414,12 @@ gconftool-2 --makefile-install-rule %{_s
 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
 
 %postun
 /sbin/ldconfig
@@ -672,11 +688,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)
@@ -696,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-2
+- Disable bogofilter subpackage if EL6+
+
 * Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).