This commit is contained in:
Warren Togami 2009-12-02 19:50:40 +00:00
parent afb6ec6017
commit 24744d730a

View File

@ -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
@ -49,7 +40,7 @@
Name: evolution
Version: 2.29.3
Release: 3%{?dist}
Release: 4%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -201,8 +192,6 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
PalmOS<tm> devices with %{name}.
%endif
%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%package bogofilter
Group: Applications/Productivity
Summary: Bogofilter plugin for Evolution
@ -211,7 +200,6 @@ Requires: bogofilter
%description bogofilter
This package contains the plugin to filter junk mail using Bogofilter.
%endif
%package spamassassin
Group: Applications/Productivity
@ -379,13 +367,6 @@ 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 ! %{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
%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@ -400,12 +381,9 @@ 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 ! %{disable_bogofilter}
# 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
@ -424,12 +402,9 @@ 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 ! %{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
%preun
if [ "$1" -eq 0 ] ; then
@ -445,14 +420,11 @@ 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 ! %{disable_bogofilter}
# 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
@ -688,14 +660,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)
@ -715,9 +684,6 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.29.3-3
- Disable bogofilter subpackage if EL6+
* Mon Nov 30 2009 Milan Crha <mcrha@redhat.com> - 2.29.3-1.fc13
- Update to 2.29.3
- Add patch for missing m4 files from tarball.