[pki-core/f21] Resolves: rhbz #1158410

[mharmsen]

commit b4bcfe05b76f375f4a3246416114283edcbabab0
Author: Matthew Harmsen <mharmsen at redhat.com>
Date:   Tue Dec 2 18:46:52 2014 -0700

    Resolves: rhbz #1158410
    
    - Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml
      by default (cfu)
    - Bugzilla Bug #1151147 - issuerDN encoding correction (cfu)
    - PKI Trac Ticket #1211 - New release overwrites old source tarball (mharmsen)
    - Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages
      not found (mharmsen)

 pki-core.spec |   42 ++++++++++++++++++++++++------------------
 sources       |    2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/pki-core.spec b/pki-core.spec
index 3c1cd7f..2438dee 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -4,8 +4,8 @@ distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:             pki-core
-Version:          10.2.1
-Release:          0.1%{?dist}
+Version:          10.2.0
+Release:          5%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -33,7 +33,6 @@ BuildRequires:    nss-devel >= 3.14.3
 BuildRequires:    openldap-devel
 BuildRequires:    pkgconfig
 BuildRequires:    policycoreutils
-BuildRequires:    python-sphinx
 BuildRequires:    velocity
 BuildRequires:    xalan-j2
 BuildRequires:    xerces-j2
@@ -63,9 +62,9 @@ BuildRequires:    policycoreutils-python
 BuildRequires:    python-ldap
 BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
-BuildRequires:    jss >= 4.2.6-28
+BuildRequires:    jss >= 4.2.6-35
 BuildRequires:    systemd-units
-BuildRequires:    tomcatjss >= 7.1.0
+BuildRequires:    tomcatjss >= 7.1.1
 
 # additional build requirements needed to build native 'tpsclient'
 # REMINDER:  Revisit these once 'tpsclient' is rewritten as a Java app
@@ -80,7 +79,14 @@ BuildRequires:    svrcore-devel
 BuildRequires:    zlib
 BuildRequires:    zlib-devel
 
-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
@@ -179,7 +185,7 @@ Group:            System Environment/Libraries
 Requires:         java-headless >= 1:1.7.0
 Requires:         nss
 Requires:         jpackage-utils >= 0:1.7.5-10
-Requires:         jss >= 4.2.6-28
+Requires:         jss >= 4.2.6-35
 
 Provides:         symkey = %{version}-%{release}
 
@@ -217,7 +223,7 @@ Requires:         java-headless >= 1:1.7.0
 Requires:         javassist
 Requires:         jackson-jaxrs-json-provider
 Requires:         jpackage-utils >= 0:1.7.5-10
-Requires:         jss >= 4.2.6-28
+Requires:         jss >= 4.2.6-35
 Requires:         ldapjdk
 Requires:         python-ldap
 Requires:         python-lxml
@@ -314,7 +320,7 @@ Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
-Requires:         tomcatjss >= 7.1.0
+Requires:         tomcatjss >= 7.1.1
 
 %description -n   pki-server
 The PKI Server Framework is required by the following four PKI subsystems:
@@ -689,7 +695,6 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %files -n pki-base
 %defattr(-,root,root,-)
 %doc base/common/LICENSE
-%doc base/common/html/
 %dir %{_datadir}/pki
 %{_datadir}/pki/VERSION
 %{_datadir}/pki/etc/
@@ -708,7 +713,6 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %dir %{_localstatedir}/log/pki
 %{_sbindir}/pki-upgrade
 %{_mandir}/man8/pki-upgrade.8.gz
-%{_mandir}/man1/pki-python-client.1.gz
 
 %files -n pki-tools
 %defattr(-,root,root,-)
@@ -749,7 +753,6 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %{_mandir}/man1/pki-key.1.gz
 %{_mandir}/man1/pki-securitydomain.1.gz
 %{_mandir}/man1/pki-user.1.gz
-%{_mandir}/man1/pki-ca-profile.1.gz
 
 
 %if %{with server}
@@ -854,12 +857,15 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
 %endif # %{with server}
 
 %changelog
-* 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.
-- Added CLIs to simplify generating user certificates
-- Added enhancements to KRA Python API
-- Added a man page for pki ca-profile commands.
-- Added python api docs
+* Tue Dec  2 2014 Matthew Harmsen <mharmsen at redhat.com> - 10.2.0-5
+- Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages not
+  found (mharmsen)
+- PKI Trac Ticket #1211 - New release overwrites old source tarball (mharmsen)
+- Bugzilla Bug #1151147 - issuerDN encoding correction (cfu)
+
+* Mon Nov 24 2014 Christina Fu <cfu at redhat.com> 10.2.0-4
+- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade
+- up the release number to 4
 
 * Wed Oct 1 2014 Ade Lee <alee at redhat.com> 10.2.0-3
 - Disable pylint dependency for RHEL builds
diff --git a/sources b/sources
index 3eafd91..73a6383 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb7e2aa9b843cfc4e27c697e25f0cce1  pki-core-10.2.1.tar.gz
+df2561d4dc9a953fb79072efb64dc208  pki-core-10.2.0.tar.gz