[dogtag-pki/f21] PKI TRAC Ticket #1287 - Consider backporting Dogtag 10.2.1 to Fedora 21

[mharmsen]

commit 6be07deae325d3a0cc751e87594be467bf42f0a9
Author: Matthew Harmsen <mharmsen at pki.usersys.redhat.com>
Date:   Thu Mar 5 15:21:21 2015 -0700

    PKI TRAC Ticket #1287 - Consider backporting Dogtag 10.2.1 to Fedora 21

 dogtag-pki.spec | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)
---
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index b442ba5..304fdfa 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
-Version:          10.2.0
-Release:          5%{?dist}
+Version:          10.2.1
+Release:          1%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -13,16 +13,25 @@ BuildArch:        noarch
 ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %endif
 
-%define dogtag_pki_theme_version   10.2.0
+%define dogtag_pki_theme_version   %{version}
 %define esc_version                1.1.0
 # NOTE:  The following package versions are TLS compliant:
 %define jss_version                4.2.6-35
-%define pki_core_version           10.2.0-5
-%define pki_console_version        10.2.0-5
+%define pki_core_version           %{version}
+%define pki_console_version        %{version}
+%if 0%{?rhel}
+%define tomcatjss_version          7.1.0-5
+%else
 %define tomcatjss_version          7.1.1
+%endif
 
 Requires:         apache-commons-codec
-Requires:         selinux-policy-base >= 3.11.1-43
+%if  0%{?fedora} >= 21
+Requires:         selinux-policy-targeted >= 3.13.1-9
+%else
+# 0%{?rhel} || 0%{?fedora} < 21
+Requires:         selinux-policy-targeted >= 3.12.1-153
+%endif
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
@@ -107,12 +116,19 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
-* Wed Dec  3 2014 Matthew Harmsen <mharmsen at redhat.com> 10.2.0-5
-- Make dependencies comply with TLS changes
+* Thu Jan  8 2015 Dogtag Team <pki-devel at redhat.com> 10.2.1-1
+- Update release number for release build
+
+* Tue Dec 16 2014 Matthew Harmsen <mharmsen at redhat.com> - 10.2.1-0.4
+- PKI TRAC Ticket #1205 - Outdated selinux-policy dependency.
+
+* Mon Nov 24 2014 Christina Fu <cfu at redhat.com> 10.2.1-0.2
+- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade (cfu)
+- Make dependencies comply with TLS changes (mharmsen)
+- up the release number to 0.2
 
-* Mon Nov 24 2014 Christina Fu <cfu at redhat.com> 10.2.0-4
-- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade
-- up the release number to 4
+* Fri Oct 24 2014 Dogtag Team <pki-devel at redhat.com> 10.2.1-0.1
+- Updated version number to 10.2.1-0.1.
 
 * Tue Sep  9 2014 Matthew Harmsen <mharmsen at redhat.com> 10.2.0-3
 - PKI TRAC Ticket #1136 - Remove ipa-pki-theme component