[dogtag-pki-theme] Resolves: rhbz #1158410
mharmsen
mharmsen at fedoraproject.org
Thu Dec 4 21:50:41 UTC 2014
commit ceeea975672be05825ea507ff6960c086b860d7c
Author: Matthew Harmsen <mharmsen at redhat.com>
Date: Thu Dec 4 14:50:05 2014 -0700
Resolves: rhbz #1158410
- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml
by default (cfu)
- PKI Trac Ticket #1211 - New release overwrites old source tarball (mharmsen)
- TLS Compliance
.gitignore | 1 +
dogtag-pki-theme.spec | 85 ++++++++++++++++---------------------------------
sources | 2 +-
3 files changed, 30 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 668375e..a51b1bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/dogtag-pki-theme-10.0.5.tar.gz
/dogtag-pki-theme-10.1.0.tar.gz
/dogtag-pki-theme-10.2.0.tar.gz
+/dogtag-pki-theme-10.2.1.tar.gz
diff --git a/dogtag-pki-theme.spec b/dogtag-pki-theme.spec
index 0b4171f..c44a21b 100644
--- a/dogtag-pki-theme.spec
+++ b/dogtag-pki-theme.spec
@@ -1,6 +1,6 @@
Name: dogtag-pki-theme
-Version: 10.2.0
-Release: 1%{?dist}
+Version: 10.2.1
+Release: 0.2%{?dist}
Summary: Certificate System - Dogtag PKI Theme Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -14,34 +14,25 @@ BuildRequires: cmake
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils >= 1.7.5-10
-Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
+%if 0%{?rhel}
+# NOTE: In the future, as a part of its path, this URL will contain a release
+# directory which consists of the fixed number of the upstream release
+# upon which this tarball was originally based.
+Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}%{?prerel}.tar.gz
+%else
+Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{release}/%{name}-%{version}%{?prerel}.tar.gz
+%endif
%if 0%{?rhel}
ExcludeArch: ppc ppc64 ppcle ppc64le s390 s390x
%endif
%global overview \
-Several PKI packages require a "virtual" theme component. These \
+Several PKI packages utilize 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! \
- \
-On Fedora systems, the "dogtag" theme packages are the ONLY available \
-theme components. \
- \
-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. \
+including "dogtag" or a user customized theme package. Consequently, \
+all "dogtag" and any customized theme components MUST be mutually \
+exclusive! \
%{nil}
%description %{overview}
@@ -51,36 +42,6 @@ for its corresponding "ipa" theme package or "dogtag" theme package. \
Summary: Certificate System - PKI Server Framework User Interface
Group: System Environment/Base
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts: redhat-pki-server-theme
-Conflicts: redhat-pki-common-theme
-Conflicts: redhat-pki-common-ui
-Conflicts: redhat-pki-ca-theme
-Conflicts: redhat-pki-ca-ui
-Conflicts: redhat-pki-kra-theme
-Conflicts: redhat-pki-kra-ui
-Conflicts: redhat-pki-ocsp-theme
-Conflicts: redhat-pki-ocsp-ui
-Conflicts: redhat-pki-tks-theme
-Conflicts: redhat-pki-tks-ui
-Conflicts: redhat-pki-ra-theme
-Conflicts: redhat-pki-ra-ui
-Conflicts: redhat-pki-tps-theme
-Conflicts: redhat-pki-tps-ui
-
-# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
-Obsoletes: ipa-pki-server-theme <= 9999
-Obsoletes: ipa-pki-common-theme <= 9999
-Obsoletes: ipa-pki-ca-theme <= 9999
-Obsoletes: ipa-pki-kra-theme <= 9999
-
-Provides: ipa-pki-server-theme = %{version}-%{release}
-Provides: ipa-pki-common-theme = %{version}-%{release}
-Provides: ipa-pki-ca-theme = %{version}-%{release}
-Provides: ipa-pki-kra-theme = %{version}-%{release}
-%endif
-
Obsoletes: dogtag-pki-common-theme <= %{version}-%{release}
Obsoletes: dogtag-pki-common-ui
Obsoletes: dogtag-pki-ca-theme <= %{version}-%{release}
@@ -117,10 +78,6 @@ Provides: dogtag-pki-tks-theme = %{version}-%{release}
Provides: pki-tks-theme = %{version}-%{release}
Provides: pki-tks-ui = %{version}-%{release}
-Provides: dogtag-pki-ra-theme = %{version}-%{release}
-Provides: pki-ra-theme = %{version}-%{release}
-Provides: pki-ra-ui = %{version}-%{release}
-
Provides: dogtag-pki-tps-theme = %{version}-%{release}
Provides: pki-tps-theme = %{version}-%{release}
Provides: pki-tps-ui = %{version}-%{release}
@@ -213,6 +170,20 @@ cd build
%changelog
+* 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)
+- PKI Trac Ticket #1211 - New release overwrites old source tarball (mharmsen)
+- up the release number to 0.2
+
+* 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-2
+- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
+- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui'
+ directories
+- Consolidate 'pki-core' packages
+
* Wed Sep 3 2014 Dogtag Team <pki-devel at redhat.com> 10.2.0-1
- Update release number for release build
diff --git a/sources b/sources
index a79e184..63d092b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94d907189793d50272c62ffcdacab0d1 dogtag-pki-theme-10.2.0.tar.gz
+8a234d4fb56f527a79801068c6a130f1 dogtag-pki-theme-10.2.1.tar.gz
More information about the scm-commits
mailing list