[nss-softokn/f18: 2/2] Merge branch 'master' into f18

[Elio Maldonado]

commit 4061a0b7ddae948514fb9628a5ff836d21626392
Merge: c95201b 852db1e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 1 16:49:45 2013 -0800

    Merge branch 'master' into f18
    
    Update to NSS_3_14_2_RTM

 .gitignore       |    2 +-
 iquote.patch     |   18 +++++++++---------
 nss-softokn.spec |   12 +++++++-----
 sources          |    2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)
---
diff --cc nss-softokn.spec
index 319ef37,c016aac..12cc786
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -387,16 -374,9 +386,19 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Fri Feb 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-1
+ - Update to NSS_3_14_2_RTM
+ 
 +* Wed Jan 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.1-7
 +- Actually add the LD_LIBRARY_PATH line to the post-install scriptlet 
 +- Resolves: rhbz#891369
 +
 +* Wed Jan 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.1-6
 +- Resolves: Bug 891369 - shared libraries not found due to signature verification failure
 +- Fix failure signature verification failures on post-install scriplet
 +- Add export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} before the signing commands
 +- Ensure tool links with in-tree freebl so verification uses same algorithm as in signing
 +
  * Thu Dec 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-5
  - Add RSA performance test for freebl
  - Fix bogus date in changelog warnings