Fix logic

This commit is contained in:
Warren Togami 2009-12-02 18:55:43 +00:00
parent 93079e84c1
commit afb6ec6017

View File

@ -1,5 +1,11 @@
# Variable must exist even if unused # Variable must exist even if unused
%{?!rhel:%define rhel 0} %{?!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_glib_version 0.70
%define dbus_version 1.0 %define dbus_version 1.0
@ -43,7 +49,7 @@
Name: evolution Name: evolution
Version: 2.29.3 Version: 2.29.3
Release: 2%{?dist} Release: 3%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -195,7 +201,7 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
PalmOS<tm> devices with %{name}. PalmOS<tm> devices with %{name}.
%endif %endif
%if 0%{?rhel} >= 6 %if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+ # Disable bogofilter subpackage if EL6+
%package bogofilter %package bogofilter
Group: Applications/Productivity Group: Applications/Productivity
@ -373,7 +379,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
%if 0%{?rhel} >= 6 %if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+ # 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}/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%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
@ -394,7 +400,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi fi
%if 0%{?rhel} >= 6 %if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+ # Disable bogofilter subpackage if EL6+
%pre bogofilter %pre bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@ -418,7 +424,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/apps_evolution_email_custom_header.schemas > /dev/null || :
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.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+ # Disable bogofilter subpackage if EL6+
%post bogofilter %post bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@ -439,7 +445,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi fi
%if 0%{?rhel} >= 6 %if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+ # Disable bogofilter subpackage if EL6+
%preun bogofilter %preun bogofilter
if [ "$1" -eq 0 ] ; then if [ "$1" -eq 0 ] ; then
@ -682,7 +688,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnome-pilot/conduits/e-todo.conduit %{_libdir}/gnome-pilot/conduits/e-todo.conduit
%endif %endif
%if 0%{?rhel} >= 6 %if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+ # Disable bogofilter subpackage if EL6+
%files bogofilter %files bogofilter
%defattr(-, root, root) %defattr(-, root, root)
@ -709,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.29.3-2 * Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.29.3-3
- Disable bogofilter subpackage if EL6+ - Disable bogofilter subpackage if EL6+
* Mon Nov 30 2009 Milan Crha <mcrha@redhat.com> - 2.29.3-1.fc13 * Mon Nov 30 2009 Milan Crha <mcrha@redhat.com> - 2.29.3-1.fc13