Require Encode::Detect only for distros newer than RHEL-5. Thanks trobert.

This commit is contained in:
Warren Togami 2010-02-15 22:31:49 +00:00
parent eba740a0ad
commit e71400c88f

View File

@ -23,6 +23,7 @@
%define option_ssl 0 %define option_ssl 0
%define perl_devel 0 %define perl_devel 0
%define dkim_deps 0 %define dkim_deps 0
%define require_encode_detect 0
# SSL and IPv6 (FC6+, RHEL5+) # SSL and IPv6 (FC6+, RHEL5+)
%if 0%{?fedora} > 5 %if 0%{?fedora} > 5
@ -34,6 +35,11 @@
%define perl_devel 1 %define perl_devel 1
%endif %endif
# Encode::Detect, not strictly required but helpful if you enable language detection (FC7+)
%if 0%{?fedora} > 6
%define require_encode_detect 1
%endif
%if 0%{?fedora} >= 10 %if 0%{?fedora} >= 10
# We use portreserve to prevent our TCP port being stolen. # We use portreserve to prevent our TCP port being stolen.
# Require the package here so that we know /etc/portreserve/ exists. # Require the package here so that we know /etc/portreserve/ exists.
@ -45,13 +51,13 @@ Requires: portreserve
%define dkim_deps 1 %define dkim_deps 1
%endif %endif
%define real_name Mail-SpamAssassin define real_name Mail-SpamAssassin
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
Summary: Spam filter for email which can be invoked from mail delivery agents Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin Name: spamassassin
Version: 3.3.0 Version: 3.3.0
Release: 5%{?dist} Release: 6%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://spamassassin.apache.org/ URL: http://spamassassin.apache.org/
@ -90,7 +96,9 @@ Requires: perl(LWP::UserAgent)
Requires: perl(Net::DNS) Requires: perl(Net::DNS)
Requires: perl(Time::HiRes) Requires: perl(Time::HiRes)
Requires: perl(DB_File) Requires: perl(DB_File)
%if %{require_encode_detect}
Requires: perl(Encode::Detect) Requires: perl(Encode::Detect)
%endif
Requires: procmail Requires: procmail
Requires: gnupg Requires: gnupg
@ -299,7 +307,7 @@ exit 0
- svn882672 snapshot - svn882672 snapshot
* Thu Nov 12 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.19.svn816416 * Thu Nov 12 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.19.svn816416
- Encode::Detect is important to spamassassin - Encode::Detect is important to spamassassin, require for anything newer than RHEL-5
* Thu Sep 24 2009 Warren Togami <wtogami@redhat.com> - 3.3.3-0.18.svn816416 * Thu Sep 24 2009 Warren Togami <wtogami@redhat.com> - 3.3.3-0.18.svn816416
- Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules - Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules