Re-base Dogtag to 10.5.2

This commit is contained in:
Matthew Harmsen 2017-11-27 16:31:45 -07:00
parent 5b4ba2fae7
commit 42e75c6a8d

View File

@ -1,7 +1,7 @@
%if 0%{?rhel} || 0%{?fedora} < 24
%global with_python3 0
%else
%if 0%{?fedora} || 0%{?rhel} > 7
%global with_python3 1
%else
%global with_python3 0
%endif
# Optionally fetch the release from the environment variable 'PKI_RELEASE'
@ -14,16 +14,16 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
%if 0%{?rhel}
Version: 10.5.1
%define redhat_release 1
%define redhat_release 2
%define redhat_stage 0
#%define default_release %{redhat_release}.%{redhat_stage}
%define default_release %{redhat_release}
%define default_release %{redhat_release}.%{redhat_stage}
#%define default_release %{redhat_release}
%else
Version: 10.5.1
Version: 10.5.2
%define fedora_release 1
%define fedora_stage 0
#%define default_release %{fedora_release}.%{fedora_stage}
%define default_release %{fedora_release}
%define default_release %{fedora_release}.%{fedora_stage}
#%define default_release %{fedora_release}
%endif
%if 0%{?use_pki_release}
@ -40,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%define dogtag_pki_theme_version %{version}
%if 0%{?fedora} >= 27
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
%define esc_version 1.1.1
%else
%define esc_version 1.1.0
@ -54,7 +54,7 @@ BuildArch: noarch
%endif
%define pki_console_version %{version}
%if 0%{?fedora} >= 27
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
# Exclude 'aarch64' and 's390x' architectures since
# 'esc' does not exist on these two platforms
ExcludeArch: aarch64 s390x
@ -158,6 +158,9 @@ rm -rf %{buildroot}
%doc README
%changelog
* Mon Nov 27 2017 Dogtag Team <pki-devel@redhat.com> 10.5.2-1
- Re-base Dogtag to 10.5.2
* Thu Nov 2 2017 Dogtag Team <pki-devel@redhat.com> 10.5.1-1
- Re-base Dogtag to 10.5.1