Drop mapping from RHEL releases to Fedora releases

IMHO, it's error prone and confusing. It's also hard to maintain as each
new RHEL release requires a new mapping.

Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
This commit is contained in:
Ondřej Lysoněk 2018-10-03 13:07:32 +02:00
parent ec085de3a0
commit 8754e0ccd5

View File

@ -5,22 +5,16 @@
%{?!rhel:%define rhel 0} %{?!rhel:%define rhel 0}
%{?!fedora:%define fedora 0} %{?!fedora:%define fedora 0}
# Map RHEL to Fedora version # Define dist tags for old RHEL releases
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
%define fedora 3
%define dist .el4 %define dist .el4
%endif %endif
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
%define fedora 6
%define dist .el5 %define dist .el5
%endif %endif
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
%define fedora 12
%define dist .el6 %define dist .el6
%endif %endif
%if 0%{?rhel} == 7
%define fedora 16
%endif
# Define variables to use in conditionals # Define variables to use in conditionals
%define option_ssl 0 %define option_ssl 0
@ -32,7 +26,7 @@
%define use_systemd 0 %define use_systemd 0
# SSL and IPv6 (FC6+, RHEL5+) # SSL and IPv6 (FC6+, RHEL5+)
%if 0%{?fedora} > 5 %if 0%{?fedora} > 5 || 0%{?rhel} >= 5
%define option_ssl 1 %define option_ssl 1
%endif %endif
@ -42,16 +36,16 @@
%endif %endif
# Encode::Detect, not strictly required but helpful if you enable language detection (FC7+) # Encode::Detect, not strictly required but helpful if you enable language detection (FC7+)
%if 0%{?fedora} > 6 %if 0%{?fedora} > 6 || 0%{?rhel} >= 6
%define require_encode_detect 1 %define require_encode_detect 1
%endif %endif
# Mail::DKIM by default (F11+) # Mail::DKIM by default (F11+)
%if 0%{?fedora} >= 11 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
%define dkim_deps 1 %define dkim_deps 1
%endif %endif
%if 0%{?fedora} >= 16 %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
%define use_systemd 1 %define use_systemd 1
%endif %endif