[nss-softokn/f16: 13/13] Merge branch 'f17' into f16

[Elio Maldonado]

commit b73b72d68060e0b3ba5c63ba1b17748c2d16622e
Merge: ab35fa4 0983b11
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Feb 7 20:40:59 2013 -0800

    Merge branch 'f17' into f16
    
    Update nss-softokn to NSS_3_14_2_RTM

 .gitignore                                         |    2 +-
 Bug-829088-nss-3.13.4-fips-sha224-selftest.patch   |   18 ------
 ...building-nss-softokn-against-older-sqlite.patch |   20 +++++++
 iquote.patch                                       |   18 +++---
 nss-softokn.spec                                   |   57 ++++++++++++++++---
 sources                                            |    2 +-
 6 files changed, 79 insertions(+), 38 deletions(-)
---
diff --cc nss-softokn.spec
index ed14731,960e25f..4728de8
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -13,9 -17,7 +17,8 @@@
      %{?__debug_package:%{__debug_install_post}} \
      %{__arch_install_post} \
      %{__os_install_post} \
-     export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} \
      $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
 +    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
      $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
      $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
  %{nil}