From 8814810c68cdaa9ae98dbd05f07ea9079a719ab8 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Thu, 19 Oct 2017 18:04:10 -0600
Subject: [PATCH] Re-base Dogtag to 10.5.0

---
 dogtag-pki.spec | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 22cd8c7..9663e29 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -4,15 +4,34 @@
 %global with_python3 1
 %endif
 
+# Optionally fetch the release from the environment variable 'PKI_RELEASE'
+%define use_pki_release %{getenv:USE_PKI_RELEASE}
+%if 0%{?use_pki_release}
+%define pki_release %{getenv:PKI_RELEASE}
+%endif
+
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 %if 0%{?rhel}
-Version:          10.4.1
-Release:          3%{?dist}
+Version:                10.5.0
+%define redhat_release  1
+%define redhat_stage    0
+#%define default_release %{redhat_release}.%{redhat_stage}
+%define default_release %{redhat_release}
 %else
-Version:          10.4.8
-Release:          3%{?dist}
+Version:                10.5.0
+%define fedora_release  1
+%define fedora_stage    0
+#%define default_release %{fedora_release}.%{fedora_stage}
+%define default_release %{fedora_release}
 %endif
+
+%if 0%{?use_pki_release}
+Release:          %{pki_release}%{?dist}
+%else
+Release:          %{default_release}%{?dist}
+%endif
+
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -28,7 +47,7 @@ BuildArch:        noarch
 %endif
 # NOTE:  The following package versions are TLS compliant:
 %if 0%{?rhel}
-%define pki_core_rhel_version      10.4.1
+%define pki_core_rhel_version      10.5.0
 %define pki_core_rhcs_version      %{version}
 %else
 %define pki_core_version           %{version}
@@ -139,6 +158,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Thu Oct 19 2017 Dogtag Team <pki-devel@redhat.com> 10.5.0-1
+- Re-base Dogtag to 10.5.0
+
 * Thu Aug 24 2017 Dogtag Team <pki-devel@redhat.com> 10.4.8-3
 - Added ExcludeArch directives for 'aarch64' and 's390x' on Fedora 27+ due
   to dependency on 'esc' which does not exist on these two platforms