Fix the logic

This commit is contained in:
Warren Togami 2009-12-02 18:50:52 +00:00
commit 3775b1a4fd

View file

@ -1,5 +1,11 @@
# 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
@ -46,7 +52,7 @@
Name: evolution
Version: 2.28.1
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -199,7 +205,7 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
PalmOS<tm> devices with %{name}.
%endif
%if 0%{?rhel} >= 6
%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%package bogofilter
Group: Applications/Productivity
@ -391,7 +397,7 @@ 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
%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
@ -414,7 +420,7 @@ 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
%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6
%post bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@ -688,7 +694,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnome-pilot/conduits/e-todo.conduit
%endif
%if 0%{?rhel} >= 6
%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6
%files bogofilter
%defattr(-, root, root)
@ -715,7 +721,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-2
* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-3
- Disable bogofilter subpackage if EL6+
* Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12