[dogtag-pki] Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17 (rawhide) . . . Bugzilla Bug #

[kwright]

commit 370e044ceee981e9f8327b55e378795fa4946757
Author: Kevin Wright <kwright at redhat.com>
Date:   Sun Oct 30 18:09:24 2011 -0700

    Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17
    (rawhide) . . .
    Bugzilla Bug #749945 - Installation error reported during CA, DRM,
    OCSP, and TKS package installation . . .

 clog            |    6 ++++--
 dogtag-pki.spec |   51 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 14 deletions(-)
---
diff --git a/clog b/clog
index 09719ab..f64ffa0 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,4 @@
-Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
-Established MINIMUM package versions based upon platform
+Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17
+(rawhide) . . .
+Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+OCSP, and TKS package installation . . .
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index b5a8633..addede4 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          9.0.0
-Release:          6%{?dist}
+Release:          8%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -10,20 +10,35 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 # Establish MINIMUM package versions based upon platform
+%if 0%{?fedora} >= 17
+%define dogtag_pki_theme_version   9.0.9
+%define esc_version                1.1.0
+%define jss_version                4.2.6-21
+%define osutil_version             2.0.2
+%define pki_core_version           9.0.16
+%define pki_kra_version            9.0.9
+%define pki_ocsp_version           9.0.8
+%define pki_ra_version             9.0.4
+%define pki_tks_version            9.0.8
+%define pki_tps_version            9.0.7
+%define pki_console_version        9.0.5
+%define tomcatjss_version          6.0.2
+%else
 %if 0%{?fedora} >= 16
-%define dogtag_pki_theme_version   9.0.4
+%define dogtag_pki_theme_version   9.0.9
 %define esc_version                1.1.0
 %define jss_version                4.2.6-19.1
-%define osutil_version             2.0.1
-%define pki_core_version           9.0.14
-%define pki_kra_version            9.0.7
-%define pki_ocsp_version           9.0.6
-%define pki_ra_version             9.0.0
-%define pki_tks_version            9.0.6
-%define pki_tps_version            9.0.0
-%define pki_console_version        9.0.4
-%define tomcatjss_version          6.0.1
-%elseif 0%{?fedora} >= 15
+%define osutil_version             2.0.2
+%define pki_core_version           9.0.15
+%define pki_kra_version            9.0.8
+%define pki_ocsp_version           9.0.7
+%define pki_ra_version             9.0.4
+%define pki_tks_version            9.0.7
+%define pki_tps_version            9.0.7
+%define pki_console_version        9.0.5
+%define tomcatjss_version          6.0.2
+%else
+%if 0%{?fedora} >= 15
 %define dogtag_pki_theme_version   9.0.0
 %define esc_version                1.1.0
 %define jss_version                4.2.6-17
@@ -50,6 +65,8 @@ BuildArch:        noarch
 %define pki_console_version        9.0.0
 %define tomcatjss_version          2.0.0
 %endif
+%endif
+%endif
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
@@ -177,6 +194,16 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri Oct 28 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.8-1
+- Bugzilla Bug #749927 - Java class conflicts using Java 7 in Fedora 17
+  (rawhide) . . .
+- Bugzilla Bug #749945 - Installation error reported during CA, DRM,
+  OCSP, and TKS package installation . . .
+
+* Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.7-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
 * Mon Sep 12 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.0-6
 - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
 - Established MINIMUM package versions based upon platform