From 888290d930ba4d0152d1721907b32711b32f0981 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Fri, 5 Sep 2014 20:42:57 -0700 Subject: [PATCH] Resolves Bugzilla Bug #1138883 - Rebase Dogtag 10.1 to Dogtag 10.2 --- dogtag-pki.spec | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index a18f972..dbc9887 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.1.0 -Release: 2%{?dist} +Version: 10.2.0 +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/ @@ -9,16 +9,20 @@ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%define dogtag_pki_theme_version 10.1.0 +%if 0%{?rhel} +ExcludeArch: ppc ppc64 ppcle ppc64le s390 s390x +%endif + +%define dogtag_pki_theme_version 10.2.0 %define esc_version 1.1.0 %define jss_version 4.2.6-28 -%define pki_core_version 10.1.0 -%define pki_kra_version 10.1.0 -%define pki_ocsp_version 10.1.0 -%define pki_ra_version 10.1.0 -%define pki_tks_version 10.1.0 -%define pki_tps_version 10.1.0 -%define pki_console_version 10.1.0 +%define pki_core_version 10.2.0 +%define pki_kra_version 10.2.0 +%define pki_ocsp_version 10.2.0 +%define pki_ra_version 10.2.0 +%define pki_tks_version 10.2.0 +%define pki_tps_version 10.2.0 +%define pki_console_version 10.2.0 %define tomcatjss_version 7.1.0 Requires: apache-commons-codec @@ -125,9 +129,15 @@ rm -rf %{buildroot} %doc README %changelog +* Wed Sep 3 2014 Dogtag Team 10.2.0-1 +- Update release number for release build + * Sat Jun 07 2014 Fedora Release Engineering - 10.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +* Fri Nov 22 2013 Dogtag Team 10.2.0-0.1 +- Updated version number to 10.2.0-0.1. + * Fri Nov 15 2013 Ade Lee 10.1.0-1 - Trac Ticket 788 - Clean up spec files - Update release number for release build