Removed redundant macros

This commit is contained in:
Endi S. Dewata 2018-04-11 06:03:34 +02:00
parent c04b42456f
commit 8f2e33848c

View File

@ -32,70 +32,38 @@ Release: 0.3%{?_timestamp}%{?_commit}%{?dist}
%global with_python3 0
%endif
%define dogtag_pki_theme_version %{version}
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
%define esc_version 1.1.1
%else
%define esc_version 1.1.0
%endif
# NOTE: The following package versions are TLS compliant:
%if 0%{?rhel}
%define pki_core_rhel_version 10.5.1
%define pki_core_rhcs_version %{version}
%else
%define pki_core_version %{version}
%endif
%define pki_console_version %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI theme packages
Requires: dogtag-pki-server-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-console-theme >= %{dogtag_pki_theme_version}
Requires: dogtag-pki-server-theme >= %{version}
Requires: dogtag-pki-console-theme >= %{version}
%if 0%{?rhel}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Red Hat PKI core (RHEL) packages
Requires: pki-base >= %{pki_core_rhel_version}
Requires: pki-base-java >= %{pki_core_rhel_version}
# of ALL PKI core packages
Requires: pki-base >= %{version}
Requires: pki-base-java >= %{version}
%if 0%{?with_python3}
Requires: pki-base-python3 >= %{pki_core_rhel_version}
Requires: pki-base-python3 >= %{version}
%endif
Requires: pki-ca >= %{pki_core_rhel_version}
Requires: pki-kra >= %{pki_core_rhel_version}
Requires: pki-server >= %{pki_core_rhel_version}
Requires: pki-symkey >= %{pki_core_rhel_version}
Requires: pki-tools >= %{pki_core_rhel_version}
Requires: pki-symkey >= %{version}
Requires: pki-tools >= %{version}
Requires: pki-server >= %{version}
Requires: pki-ca >= %{version}
Requires: pki-kra >= %{version}
Requires: pki-ocsp >= %{version}
Requires: pki-tks >= %{version}
Requires: pki-tps >= %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Red Hat PKI core (RHCS) packages
Requires: pki-ocsp >= %{pki_core_rhcs_version}
Requires: pki-tks >= %{pki_core_rhcs_version}
Requires: pki-tps >= %{pki_core_rhcs_version}
%else
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI core packages
Requires: pki-base >= %{pki_core_version}
Requires: pki-base-java >= %{pki_core_version}
%if 0%{?with_python3}
Requires: pki-base-python3 >= %{pki_core_version}
%endif
Requires: pki-ca >= %{pki_core_version}
Requires: pki-kra >= %{pki_core_version}
Requires: pki-ocsp >= %{pki_core_version}
Requires: pki-server >= %{pki_core_version}
Requires: pki-symkey >= %{pki_core_version}
Requires: pki-tks >= %{pki_core_version}
Requires: pki-tools >= %{pki_core_version}
Requires: pki-tps >= %{pki_core_version}
%endif
# Make certain that this 'meta' package requires the latest version(s)
# of Dogtag PKI console
Requires: pki-console >= %{pki_console_version}
# of PKI console
Requires: pki-console >= %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI clients
Requires: esc >= %{esc_version}
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
Requires: esc >= 1.1.1
%else
Requires: esc >= 1.1.0
%endif
%description
The Dogtag Public Key Infrastructure (PKI) Suite is comprised of the following
@ -153,6 +121,7 @@ EOF
* Mon Apr 9 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.0-0.4
- Updated project URL
- Cleaned up spec file
* Thu Mar 29 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.0-0.3
- Rebased to PKI 10.6.0 beta2