Merge branch 'f14' into f13

2011-03-26 13:53:48 -07:00 · 2011-03-26 13:53:48 -07:00 · 79ce62fe59
commit 79ce62fe59
parent 85c352f22b c400a7a567
2 changed files with 5 additions and 2 deletions
--- a/nss.spec
+++ b/nss.spec
@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.9
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@ -513,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h


 %changelog
+* Wed Mar 25 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-9
+- Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
+
 * Wed Feb 24 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-8
 - Short-term fix for ssl test suites hangs on ipv6 type connections (#539183)
 - Add a missing requires for pkcs11-devel (#675196)
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-b3dda60fc3d22d1b02b2330428a2b759  nss-3.12.9-stripped.tar.bz2
+240c8d61d9c9091e486318e889bc1f2f  nss-3.12.9-stripped.tar.bz2
 e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db