[nss: 8/8] Merge branch 'f16'

[Elio Maldonado]

commit 2980194bf3f67d2cc48691c530371a591b671212
Merge: 5fe8f41 321e446
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 4 23:29:00 2011 -0800

    Merge branch 'f16'

 nofipstest.patch               |   19 ++
 nosha224.patch                 |  618 ++++++++++++++++++++++++++++++++++++++++
 nss.spec                       |   58 +++--
 nsspem-use-system-freebl.patch |   16 +
 terminalrecord.patch           |   90 ++++++
 5 files changed, 778 insertions(+), 23 deletions(-)
---
diff --cc nss.spec
index fa017ad,6d5cbd6..9cfa0c0
--- a/nss.spec
+++ b/nss.spec
@@@ -7,7 -7,7 +7,7 @@@
  Summary:          Network Security Services
  Name:             nss
  Version:          3.13.1
--Release:          5%{?dist}
++Release:          6%{?dist}
  License:          MPLv1.1 or GPLv2+ or LGPLv2+
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
@@@ -229,7 -248,7 +241,7 @@@ export NSS_ECC_MORE_THAN_SUITE_
                            -e "s,%%NSS_VERSION%%,%{version},g" \
                            -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                            -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
--                          -e "s,%%SOFTOKEN_VERSION%%,%{nss_softokn_fips_version},g" > \
++                          -e "s,%%SOFTOKEN_VERSION%%,%{nss_softokn_version},g" > \
                            ./mozilla/dist/pkgconfig/nss.pc
  
  NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
@@@ -562,16 -581,16 +574,16 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
- * Mon Nov 28 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-5
- - Dropping the %%{?_isa} from Requires: nss-system-init as it causes problems
- 
- * Sun Nov 27 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-4
- - Changed the minimum required softokn version to nss_softokn_fips_version
- - This is a temporary change to enable merging into the new rhel git repo
- - Using Requires: nss-system-init%%{?_isa} to prevent multilib install problems (rhbz#751694)
- 
- * Thu Nov 09 2011 Dan Williams <dcbw at redhat.com> - 3.13.1-3
- - Fix builds of packages that use NSS due to a small header file error
 -* Sun Dec 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-5
++* Sun Dec 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-6
+ - Statically link the pem module against system freebl found in buildroot
+ - Disabling sha224-related powerup selftest until we update softokn
+ - Disable sha224 and pss tests which nss-softokn 3.12.x doesn't support
+ 
+ * Fri Dec 02 2011 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.1-4
+ - Rebuild with nss-softokn from 3.12 in the buildroot
+ - Allows the pem module to statically link against 3.12.x freebl
+ - Required for using nss-3.13.x with nss-softokn-3.12.y for a merge inrto rhel git repo
+ - Build will be temprarily placed on buildroot override but not pushed in bodhi
  
  * Fri Nov 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-2
  - Fix broken dependencies by updating the nss-util and nss-softokn versions