From c280a2154864de12d66fe3c38ab0aeaf8bce54be Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Sun, 28 Apr 2013 02:53:18 -0400 Subject: [PATCH] Trac Ticket #597 - Create 10.0.2 builds --- dogtag-pki.spec | 122 ++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 65 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index f85caab..eab400a 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.0.1 -Release: 2%{?dist} +Version: 10.0.2 +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/ @@ -11,67 +11,67 @@ BuildArch: noarch # Establish MINIMUM package versions based upon platform %if 0%{?rhel} || 0%{?fedora} >= 19 -%define dogtag_pki_theme_version 10.0.0 +%define dogtag_pki_theme_version 10.0.2 %define esc_version 1.1.0 %define jss_version 4.2.6-28 -%define pki_core_version 10.0.1 -%define pki_kra_version 10.0.0 -%define pki_ocsp_version 10.0.0 -%define pki_ra_version 10.0.0 -%define pki_tks_version 10.0.0 -%define pki_tps_version 10.0.0 -%define pki_console_version 10.0.0 +%define pki_core_version 10.0.2 +%define pki_kra_version 10.0.2 +%define pki_ocsp_version 10.0.2 +%define pki_ra_version 10.0.2 +%define pki_tks_version 10.0.2 +%define pki_tps_version 10.0.2 +%define pki_console_version 10.0.2 %define tomcatjss_version 7.1.0 %else %if 0%{?fedora} >= 18 -%define dogtag_pki_theme_version 10.0.0 +%define dogtag_pki_theme_version 10.0.2 %define esc_version 1.1.0 %define jss_version 4.2.6-24 -%define pki_core_version 10.0.1 -%define pki_kra_version 10.0.0 -%define pki_ocsp_version 10.0.0 -%define pki_ra_version 10.0.0 -%define pki_tks_version 10.0.0 -%define pki_tps_version 10.0.0 -%define pki_console_version 10.0.0 +%define pki_core_version 10.0.2 +%define pki_kra_version 10.0.2 +%define pki_ocsp_version 10.0.2 +%define pki_ra_version 10.0.2 +%define pki_tks_version 10.0.2 +%define pki_tps_version 10.0.2 +%define pki_console_version 10.0.2 %define tomcatjss_version 7.0.0-4 %else %if 0%{?fedora} >= 17 -%define dogtag_pki_theme_version 10.0.0 +%define dogtag_pki_theme_version 10.0.2 %define esc_version 1.1.0 %define jss_version 4.2.6-24 -%define pki_core_version 10.0.1 -%define pki_kra_version 10.0.0 -%define pki_ocsp_version 10.0.0 -%define pki_ra_version 10.0.0 -%define pki_tks_version 10.0.0 -%define pki_tps_version 10.0.0 -%define pki_console_version 10.0.0 +%define pki_core_version 10.0.2 +%define pki_kra_version 10.0.2 +%define pki_ocsp_version 10.0.2 +%define pki_ra_version 10.0.2 +%define pki_tks_version 10.0.2 +%define pki_tps_version 10.0.2 +%define pki_console_version 10.0.2 %define tomcatjss_version 7.0.0-3 %else %if 0%{?fedora} >= 16 -%define dogtag_pki_theme_version 10.0.0 +%define dogtag_pki_theme_version 10.0.2 %define esc_version 1.1.0 %define jss_version 4.2.6-24 -%define pki_core_version 10.0.1 -%define pki_kra_version 10.0.0 -%define pki_ocsp_version 10.0.0 -%define pki_ra_version 10.0.0 -%define pki_tks_version 10.0.0 -%define pki_tps_version 10.0.0 -%define pki_console_version 10.0.0 +%define pki_core_version 10.0.2 +%define pki_kra_version 10.0.2 +%define pki_ocsp_version 10.0.2 +%define pki_ra_version 10.0.2 +%define pki_tks_version 10.0.2 +%define pki_tps_version 10.0.2 +%define pki_console_version 10.0.2 %define tomcatjss_version 6.0.2 %else -%define dogtag_pki_theme_version 10.0.0 +%define dogtag_pki_theme_version 10.0.2 %define esc_version 1.1.0 %define jss_version 4.2.6-24 -%define pki_core_version 10.0.1 -%define pki_kra_version 10.0.0 -%define pki_ocsp_version 10.0.0 -%define pki_ra_version 10.0.0 -%define pki_tks_version 10.0.0 -%define pki_tps_version 10.0.0 -%define pki_console_version 10.0.0 +%define pki_core_version 10.0.2 +%define pki_kra_version 10.0.2 +%define pki_ocsp_version 10.0.2 +%define pki_ra_version 10.0.2 +%define pki_tks_version 10.0.2 +%define pki_tps_version 10.0.2 +%define pki_console_version 10.0.2 %define tomcatjss_version 2.0.0 %endif %endif @@ -93,8 +93,6 @@ Requires: jss-javadoc >= %{jss_version} # 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-ra-theme >= %{dogtag_pki_theme_version} -Requires: dogtag-pki-tps-theme >= %{dogtag_pki_theme_version} # Make certain that this 'meta' package requires the latest version(s) # of ALL Dogtag PKI core packages @@ -130,27 +128,14 @@ Requires: pki-console >= %{pki_console_version} # of ALL Dogtag PKI clients Requires: esc >= %{esc_version} -# NOTE: Several PKI packages require a "virtual" theme component. These -# "virtual" theme components are "Provided" by various theme "flavors" -# including "dogtag", "redhat", and "ipa". Consequently, -# all "dogtag", "redhat", and "ipa" theme components MUST be -# mutually exclusive! +# NOTE: As a convenience for standalone deployments, this 'dogtag-pki' +# top-level meta package supplies Dogtag themes for use by the +# certificate server packages: # -# On Fedora systems, the "dogtag" theme packages are the ONLY available -# theme components. +# * dogtag-pki-theme (Dogtag Certificate System deployments) +# * dogtag-pki-server-theme +# * dogtag-pki-console-theme # -# Similarly, the "ipa" theme packages are ONLY available on RHEL -# systems, and represent the default theme components. -# -# Alternatively, on RHEL systems, if the "dogtag" theme packages are -# available as EPEL packages, while they may be used as a transparent -# replacement for their corresponding "ipa" theme package, they are not -# intended to be used as a replacement for their corresponding "redhat" -# theme components. -# -# Finally, if available for a RHEL system (e. g. - RHCS subscription), -# each "redhat" theme package MUST be used as a transparent replacement -# for its corresponding "ipa" theme package or "dogtag" theme package. Obsoletes: ipa-pki Conflicts: redhat-pki @@ -201,8 +186,15 @@ rm -rf %{buildroot} %doc README %changelog -* Wed Feb 13 2013 Fedora Release Engineering - 10.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild +* Fri Apr 26 2013 Ade Lee 10.0.2-1 +- Change release number for official release. + +* Wed Mar 27 2013 Endi S. Dewata 10.0.2-0.1 +- Updated version number to 10.0.2-0.1. + +* Mon Mar 4 2013 Matthew Harmsen 10.0.1-2 +- TRAC Ticket #517 - Clean up theme dependencies +- TRAC Ticket #518 - Remove UI dependencies from pkispawn . . . * Tue Jan 15 2013 Ade Lee 10.0.1-1 - Update for release of 10.0.1 for pki-core