[dogtag-pki] Resolves Dogtag Trac Ticket #282 - Create official f18 builds for dogtag 10
Ade Lee
vakwetu at fedoraproject.org
Fri Sep 14 19:25:46 UTC 2012
commit 0e95f9ead9ce2909de0368bde6f0f9c533a4bae5
Author: Ade Lee <alee at redhat.com>
Date: Fri Sep 14 15:23:52 2012 -0400
Resolves Dogtag Trac Ticket #282 - Create official f18 builds for dogtag 10
clog | 3 -
dogtag-pki.spec | 143 ++++++++++++++++++++++++++++++------------------------
2 files changed, 79 insertions(+), 67 deletions(-)
---
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index f18183b..3b5254d 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -1,7 +1,14 @@
+# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
+# also remove the space between % and global - this space is needed because
+# fedpkg verrel stupidly ignores comment lines
+%global prerel .a1
+# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
+%global relprefix 0.
+
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
-Version: 9.0.0
-Release: 11%{?dist}
+Version: 10.0.0
+Release: %{?relprefix}8%{?prerel}%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@@ -10,68 +17,65 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Establish MINIMUM package versions based upon platform
+%if 0%{?fedora} >= 18
+%define dogtag_pki_theme_version 10.0.0
+%define esc_version 1.1.0
+%define jss_version 4.2.6-24
+%define pki_core_version 10.0.0
+%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 tomcatjss_version 7.0.0
+%else
%if 0%{?fedora} >= 17
-%define dogtag_pki_theme_version 9.0.11
+%define dogtag_pki_theme_version 10.0.0
%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.18
-%define pki_kra_version 9.0.10
-%define pki_ocsp_version 9.0.9
-%define pki_ra_version 9.0.4
-%define pki_tks_version 9.0.9
-%define pki_tps_version 9.0.7
-%define pki_console_version 9.0.5
-%define tomcatjss_version 6.0.2
+%define jss_version 4.2.6-24
+%define pki_core_version 10.0.0
+%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 tomcatjss_version 7.0.0
%else
%if 0%{?fedora} >= 16
-%define dogtag_pki_theme_version 9.0.11
+%define dogtag_pki_theme_version 10.0.0
%define esc_version 1.1.0
-%define jss_version 4.2.6-19.1
-%define osutil_version 2.0.2
-%define pki_core_version 9.0.18
-%define pki_kra_version 9.0.10
-%define pki_ocsp_version 9.0.9
-%define pki_ra_version 9.0.4
-%define pki_tks_version 9.0.9
-%define pki_tps_version 9.0.7
-%define pki_console_version 9.0.5
+%define jss_version 4.2.6-24
+%define pki_core_version 10.0.0
+%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 tomcatjss_version 6.0.2
%else
-%if 0%{?fedora} >= 15
-%define dogtag_pki_theme_version 9.0.11
+%define dogtag_pki_theme_version 10.0.0
%define esc_version 1.1.0
-%define jss_version 4.2.6-17
-%define osutil_version 2.0.1
-%define pki_core_version 9.0.18
-%define pki_kra_version 9.0.10
-%define pki_ocsp_version 9.0.9
-%define pki_ra_version 9.0.0
-%define pki_tks_version 9.0.9
-%define pki_tps_version 9.0.0
-%define pki_console_version 9.0.0
-%define tomcatjss_version 6.0.0
-%else
-%define dogtag_pki_theme_version 9.0.0
-%define esc_version 1.1.0
-%define jss_version 4.2.6-17
-%define osutil_version 2.0.0
-%define pki_core_version 9.0.0
-%define pki_kra_version 9.0.0
-%define pki_ocsp_version 9.0.0
-%define pki_ra_version 9.0.0
-%define pki_tks_version 9.0.0
-%define pki_tps_version 9.0.0
-%define pki_console_version 9.0.0
+%define jss_version 4.2.6-24
+%define pki_core_version 10.0.0
+%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 tomcatjss_version 2.0.0
%endif
%endif
%endif
+Requires: apache-commons-codec
+
# Make certain that this 'meta' package requires the latest version(s)
# of ALL top-level Dogtag PKI support packages
Requires: jss >= %{jss_version}
-Requires: osutil >= %{osutil_version}
Requires: tomcatjss >= %{tomcatjss_version}
# Make certain that this 'meta' package requires the latest version(s)
@@ -92,14 +96,13 @@ 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
Requires: pki-ca >= %{pki_core_version}
-Requires: pki-common >= %{pki_core_version}
-Requires: pki-java-tools >= %{pki_core_version}
-Requires: pki-native-tools >= %{pki_core_version}
+Requires: pki-server >= %{pki_core_version}
+Requires: pki-tools >= %{pki_core_version}
Requires: pki-selinux >= %{pki_core_version}
Requires: pki-setup >= %{pki_core_version}
Requires: pki-silent >= %{pki_core_version}
Requires: pki-symkey >= %{pki_core_version}
-Requires: pki-util >= %{pki_core_version}
+Requires: pki-base >= %{pki_core_version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI core javadocs
@@ -194,18 +197,30 @@ rm -rf %{buildroot}
%doc README
%changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Mar 9 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.10-1
-- Bugzilla Bug #796006 - Get DOGTAG_9_BRANCH GIT repository in-sync
- with DOGTAG_9_BRANCH SVN repository . . .
-
-* Thu Jan 5 2012 Matthew Harmsen <mharmsen at redhat.com> 9.0.9-1
-- Bugzilla Bug #737761 - Update Dogtag Packages for Fedora 16
- (Update minimum packages to account for NSS bug change in
- Bugzilla Bug #771357 - sslget does not work after FEDORA-2011-17400
- update, breaking FreeIPA install)
+* Wed Aug 22 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.8.a1
+- Replaced pki-native-tools and pki-java-tools with pki-tools
+
+* Wed Aug 22 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.7.a1
+- Replaced pki-util, pki-deploy, pki-common with pki-base and pki-server
+
+* Tue Aug 14 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.6.a1
+- Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 17
+- Added 'pki-deploy' runtime dependency
+
+* Thu Jun 14 2012 Matthew Harmsen <mharmsen at redhat.com> 10.0.0-0.5.a1
+- Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 18
+
+* Thu Apr 5 2012 Christina Fu <cfu at redhat.com> 10.0.0-0.4.a1
+- Bug 745278 - [RFE] ECC encryption keys cannot be archived
+
+* Wed Feb 22 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.3.a1
+- Removed dependency on OSUtil.
+
+* Wed Feb 22 2012 Endi S. Dewata <edewata at redhat.com> 10.0.0-0.2.a1
+- Added dependency on Apache Commons Codec.
+
+* Wed Feb 1 2012 Nathan Kinder <nkinder at redhat.com> 10.0.0-0.1.a1
+- Updated package version number
* 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
More information about the scm-commits
mailing list