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

[Elio Maldonado]

commit ab35fa468876701330daeeb0c83ccfc7d4d71eaf
Merge: 0903ae3 02959ed
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 26 15:01:35 2012 -0800

    Merge branch 'f17' into f16
    
    - selective merge
    - update to nss-3.14.1

 .gitignore                               |    2 +-
 build-nss-softoken-only.patch            |   38 +++++++++++++++
 nss-softokn.spec                         |   25 +++++++---
 nss-split-softokn.sh                     |   39 ++++++++++------
 softoken-minimal-test-dependencies.patch |   75 ++++++++++++++---------------
 sources                                  |    2 +-
 6 files changed, 119 insertions(+), 62 deletions(-)
---
diff --cc nss-softokn.spec
index 60005d8,1959c7c..ed14731
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -298,28 -292,8 +297,28 @@@ d
    %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
  done
  
 +# Because libcrypt depends on libfreebl3.so, it is special
 +# so we install it in /lib{64}, keeping a symbolic link to it
 +# back in /usr/lib{64} to keep everyone else working
 +for file in libfreebl3.so
 +do
 +  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
 +  # Camn't use symbolic links at the moment ...
 +  #ln -sf /%{_lib}/libfreebl3.so $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so
 +  # need a real library so signing works while boostrapping
 +  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 +done
 +
 +# Make sure chk files can be found in both places
 +for file in libfreebl3.chk
 +do
 +  #ln -s /%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 +  # need a real .chk file so the signing works while boostrapping
 +  cp -p /%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 +done
 +
  # Copy the binaries we ship as unsupported
- for file in shlibsign
+ for file in bltest fipstest shlibsign
  do
    %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
  done
@@@ -404,7 -376,19 +405,17 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Sat Dec 22 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-3
+ - Cleanup patches for building softoken only libraries and tests
+ 
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-2
+ - Require nspr version >= 4.9.4
+ 
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-1
+ - Update to NSS_3_14_1_RTM
 -
 -* Mon Dec 03 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-6
+ - Bug 883114 - Install bltest and fipstest as unsupported tools
+ 
 -* Mon Nov 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
 +* Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
  - Update to NSS_3_14_RTM
  - Restore and update patch for Bug 829088 for code changes in nss-3.14
  - Update the license to MPLv2.0