rpms/evolution/devel evolution.spec,1.426,1.427
Warren Togami 砥上勇
wtogami at fedoraproject.org
Wed Dec 2 18:55:43 UTC 2009
Author: wtogami
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25174
Modified Files:
evolution.spec
Log Message:
Fix logic
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- evolution.spec 2 Dec 2009 18:22:46 -0000 1.426
+++ evolution.spec 2 Dec 2009 18:55:43 -0000 1.427
@@ -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
@@ -43,7 +49,7 @@
Name: evolution
Version: 2.29.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@@ -195,7 +201,7 @@ This package contains conduits for synch
PalmOS<tm> devices with %{name}.
%endif
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%package bogofilter
Group: Applications/Productivity
@@ -373,7 +379,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-in
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
@@ -394,7 +400,7 @@ gconftool-2 --makefile-uninstall-rule %{
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%pre bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -418,7 +424,7 @@ 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
+%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%post bogofilter
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -439,7 +445,7 @@ gconftool-2 --makefile-uninstall-rule %{
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || :
fi
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
# Disable bogofilter subpackage if EL6+
%preun bogofilter
if [ "$1" -eq 0 ] ; then
@@ -682,7 +688,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)
@@ -709,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-2
+* Wed Dec 02 2009 Warren Togami <wtogami at redhat.com> - 2.29.3-3
- Disable bogofilter subpackage if EL6+
* Mon Nov 30 2009 Milan Crha <mcrha at redhat.com> - 2.29.3-1.fc13
More information about the fedora-extras-commits
mailing list