[nss/f17] - Update to NSS_3_14_1_WITH_CKBI_1_93_RTM

[Kai Engert]

commit fb479754a0d81a1e22bb63aa60f2b03821d7078a
Author: Kai Engert <kaie at redhat.com>
Date:   Thu Jan 3 19:15:31 2013 +0100

    - Update to NSS_3_14_1_WITH_CKBI_1_93_RTM

 .gitignore |    2 +-
 nss.spec   |   15 +++++++++++++--
 sources    |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a948d04..6c7c806 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ blank-key4.db
 PayPalEE.cert
 /nss-pem-20120811.tar.bz2
 /dummy-sources-for-testing
-/nss-3.14.1-stripped.tar.bz2
+/nss-3.14.1.with.ckbi.1.93-stripped.tar.bz2
diff --git a/nss.spec b/nss.spec
index 2520f09..9d2d488 100644
--- a/nss.spec
+++ b/nss.spec
@@ -4,10 +4,14 @@
 %global nss_softokn_version 3.14
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
+# Define if using a source archive like "nss-version.with.ckbi.version".
+# To "disable", add "#" to start of line, AND a space after "%".
+%define nss_ckbi_suffix .with.ckbi.1.93
+
 Summary:          Network Security Services
 Name:             nss
 Version:          3.14.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -29,7 +33,11 @@ BuildRequires:    gawk
 BuildRequires:    psmisc
 BuildRequires:    perl
 
-Source0:          %{name}-%{version}-stripped.tar.bz2
+%{!?nss_ckbi_suffix:%define full_nss_version %{version}}
+%{?nss_ckbi_suffix:%define full_nss_version %{version}%{nss_ckbi_suffix}}
+
+Source0:          %{name}-%{full_nss_version}-stripped.tar.bz2
+
 # The stripped tar ball is a subset of the upstream sources with
 # patent-encumbered cryptographic algorithms removed.
 # Use this script to remove them and create the stripped archive.
@@ -603,6 +611,9 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Wed Jan 02 2013 Kai Engert <kaie at redhat.com> - 3.14.1-3
+- Update to NSS_3_14_1_WITH_CKBI_1_93_RTM
+
 * Sat Dec 22 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-2
 - Require nspr >= 4.9.4
 - Fix changelog invalid dates
diff --git a/sources b/sources
index 5e6526f..fa53974 100644
--- a/sources
+++ b/sources
@@ -6,4 +6,4 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
 2a06bf7b815d1a666cc3587b895506ce  nss-pem-20120811.tar.bz2
 0be54f196b5da7e9008eb13a71bc2cb0  dummy-sources-for-testing
-78b4c196af29ef5e7851447029f947c0  nss-3.14.1-stripped.tar.bz2
+331910e63d3ff5ff3acb845ba44dcf56  nss-3.14.1.with.ckbi.1.93-stripped.tar.bz2