From 51fff2b534648ba5411bafea69e72f17802f2370 Mon Sep 17 00:00:00 2001
From: Kai Engert <kengert@fedoraproject.org>
Date: Fri, 23 Jan 2009 05:32:12 +0000
Subject: [PATCH] - Update to NSS_3_12_2_WITH_CKBI_1_73_RTM

---
 .cvsignore           |  2 +-
 nss-enable-pem.patch | 14 +++++---------
 nss.spec             | 10 ++++++----
 sources              |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 870bfdf..e80e094 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.2.0-stripped.tar.bz2
+nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2
diff --git a/nss-enable-pem.patch b/nss-enable-pem.patch
index 451d902..92997f0 100644
--- a/nss-enable-pem.patch
+++ b/nss-enable-pem.patch
@@ -1,11 +1,7 @@
-Index: mozilla/security/nss/lib/ckfw/manifest.mn
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
-retrieving revision 1.9
-diff -u -r1.9 manifest.mn
---- mozilla/security/nss/lib/ckfw/manifest.mn   16 Dec 2005 00:48:01 -0000      1.9
-+++ mozilla/security/nss/lib/ckfw/manifest.mn   31 Aug 2007 17:58:23 -0000
-@@ -38,7 +38,7 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem ./mozilla/security/nss/lib/ckfw/manifest.mn
+--- ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem	2007-08-15 17:29:52.000000000 +0200
++++ ./mozilla/security/nss/lib/ckfw/manifest.mn	2009-01-23 05:49:59.000000000 +0100
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
  
  CORE_DEPTH = ../../..
  
@@ -13,4 +9,4 @@ diff -u -r1.9 manifest.mn
 +DIRS = builtins pem
  
  PRIVATE_EXPORTS = \
-        ck.h              \
+ 	ck.h		  \
diff --git a/nss.spec b/nss.spec
index e099ff8..8c5f49c 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,11 +1,11 @@
 %define nspr_version 4.7
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
-%define ckbi_version 1.72
+%define ckbi_version 1.73
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.0
-Release:          1.1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -20,8 +20,8 @@ BuildRequires:    psmisc
 BuildRequires:    perl
 BuildRequires:    zlib-devel
 
-Source0:          %{name}-%{version}-stripped.tar.bz2
-#Source0:          %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
+#Source0:          %{name}-%{version}-stripped.tar.bz2
+Source0:          %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
 
 Source1:          nss.pc.in
 Source2:          nss-config.in
@@ -446,6 +446,8 @@ done
 
 
 %changelog
+* Fri Jan 23 2009 Kai Engert <kengert@redhat.com> - 3.12.2.0-2
+- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM
 * Wed Nov 19 2008 Kai Engert <kengert@redhat.com> - 3.12.2.0-1.1
 - Update to NSS_3_12_2_RC1
 - Use system zlib
diff --git a/sources b/sources
index a4002aa..3df0977 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-44f67ccacc95eb7cd712aadcf37ec36c  nss-3.12.2.0-stripped.tar.bz2
+19accf388ecde62343ce5e564d1f4d0b  nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2