rpms/evolution/F-12 evolution.spec,1.421,1.422

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	evolution.spec 
Log Message:
remove



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -p -r1.421 -r1.422
--- evolution.spec	2 Dec 2009 18:50:52 -0000	1.421
+++ evolution.spec	2 Dec 2009 19:53:27 -0000	1.422
@@ -1,12 +1,3 @@
-# Variable must exist even if unused
-%{?!rhel:%define rhel 0}
-%define disable_bogofilter 0
-
-%if 0%{?rhel} >= 6
-# Disable bogofilter subpackage if EL6+
-%define disable_bogofilter 1
-%endif
-
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -205,8 +196,6 @@ This package contains conduits for synch
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -215,7 +204,6 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
-%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -397,13 +385,6 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if ! %{disable_bogofilter}
-# 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
@@ -420,12 +401,9 @@ 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 ! %{disable_bogofilter}
-# 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
@@ -694,14 +672,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if ! %{disable_bogofilter}
-# 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)
@@ -721,9 +696,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.28.1-3
-- 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).