Spec file changes to support the following issues:

- 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

3 files changed, 28 insertions, 10 deletions

diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index c7524ece6..c44a21b50 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -14,7 +14,14 @@ 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
@@ -164,7 +171,8 @@ cd build
 
 %changelog
 * Mon Nov 24 2014 Christina Fu <cfu@redhat.com> 10.2.1-0.2
-- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade
+- 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@redhat.com> 10.2.1-0.1
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index a53c38d68..afb278324 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -15,9 +15,10 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 
 %define dogtag_pki_theme_version   %{version}
 %define esc_version                1.1.0
+# NOTE:  The following package versions are TLS compliant:
 %define jss_version                4.2.6-35
-%define pki_core_version           %{version}
-%define pki_console_version        %{version}
+%define pki_core_version           %{version}-0.2
+%define pki_console_version        %{version}-0.2
 %define tomcatjss_version          7.1.1
 
 Requires:         apache-commons-codec
@@ -107,7 +108,8 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Nov 24 2014 Christina Fu <cfu@redhat.com> 10.2.1-0.2
-- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade
+- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade (cfu)
+- Make dependencies comply with TLS changes (mharmsen)
 - up the release number to 0.2
 
 * Fri Oct 24 2014 Dogtag Team <pki-devel@redhat.com> 10.2.1-0.1
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index e8756a6a3..396d109f6 100644
--- a/specs/pki-console.spec
+++ b/specs/pki-console.spec
@@ -21,17 +21,24 @@ BuildRequires:    nss-devel
 BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 1.7.5-10
 BuildRequires:    jss >= 4.2.6-35
-BuildRequires:    pki-base >= 10.0.0
+BuildRequires:    pki-base >= %{version}-0.2
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.7.0
 Requires:         ldapjdk
-Requires:         pki-base >= 10.0.0
-Requires:         pki-console-theme >= 9.0.0
+Requires:         pki-base >= %{version}-0.2
+Requires:         pki-console-theme >= %{version}
 Requires:         jpackage-utils >= 1.7.5-10
 Requires:         jss >= 4.2.6-35
 
-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
@@ -89,7 +96,8 @@ cd build
 
 %changelog
 * Mon Nov 24 2014 Christina Fu <cfu@redhat.com> 10.2.1-0.2
-- Ticket 1198 Bugzilla 1158410 add TLS range support to server.xml by default and upgrade
+- 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@redhat.com> 10.2.1-0.1