Fix nss-pem requirement on multilib

This commit is contained in:
Daiki Ueno 2017-11-10 15:13:21 +01:00
parent 372993eecd
commit 4cda06bd35

View File

@ -21,7 +21,7 @@ Name: nss
Version: 3.33.0 Version: 3.33.0
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 1.0%{?dist} Release: 1.1%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -49,7 +49,7 @@ BuildRequires: perl-interpreter
# programs relying on that continue to work until they are fixed to require # programs relying on that continue to work until they are fixed to require
# nss-pem instead. Once all of them are fixed, the following line can be # nss-pem instead. Once all of them are fixed, the following line can be
# removed. See https://bugzilla.redhat.com/1346806 for details. # removed. See https://bugzilla.redhat.com/1346806 for details.
Requires: nss-pem Requires: nss-pem%{?_isa}
# NSS 3.28.1 introduced a curve, that is smaller than a check in old # NSS 3.28.1 introduced a curve, that is smaller than a check in old
# Mozilla code allows. # Mozilla code allows.
@ -803,6 +803,10 @@ fi
%changelog %changelog
* Fri Nov 10 2017 Daiki Ueno <dueno@redhat.com> - 3.33.0-1.1
- Make sure 32bit nss-pem always be installed with 32bit nss in
multlib environment, patch by Kamil Dudka
* Tue Oct 3 2017 Daiki Ueno <dueno@redhat.com> - 3.33.0-1.0 * Tue Oct 3 2017 Daiki Ueno <dueno@redhat.com> - 3.33.0-1.0
- Update to NSS 3.33.0 - Update to NSS 3.33.0