[nss-softokn/f15: 2/3] Merge branch 'f16' into f15

[Elio Maldonado]

commit 099d4efa52a20d470fdfc335922c5542145ea122
Merge: 024a949 d71f133
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Mar 10 13:10:53 2012 -0800

    Merge branch 'f16' into f15

 .gitignore                               |    2 +-
 nss-softokn-3.12.4-prelink.patch         |   55 ----
 nss-softokn.spec                         |   23 ++-
 nss-split-softokn.sh                     |   17 ++-
 softoken-minimal-test-dependencies.patch |  403 +++++++++++++++---------------
 sources                                  |    2 +-
 6 files changed, 229 insertions(+), 273 deletions(-)
---
diff --cc nss-softokn.spec
index 23df16f,e002d29..1d3cd36
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -387,9 -390,14 +391,14 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Sat Mar 10 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-1
+ - Update to NSS_3_13_3_RTM
+ - Selective merge from f17 to skip /usrmove related changes
+ - Don't install everything in /usr nor add filesystem guard
+ 
 -* Fri Dec 30 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-15
 +* Sat Dec 31 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-15
  - Bug 770999 - Fix segmentation violation when turning on fips mode
 -- Reintroduce the iquote patch but don't apply it unless needed
 +- Applying the iquote patch for boostrapping
  
  * Tue Dec 13 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-14
  - Restore the update to 3.13.1