From 1c7a019432e000a320c0cd7e0d556699e824f0e1 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 30 Oct 2020 17:47:49 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nss.git#b09fff4da101841d043014150107559d3f9f5dfa --- nss.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nss.spec b/nss.spec index 85434b6..c994228 100644 --- a/nss.spec +++ b/nss.spec @@ -1,5 +1,8 @@ %global nspr_version 4.29.0 -%global nspr_release 2 +# NOTE: To avoid NVR clashes of nspr* packages: +# - reset %%{nspr_release} to 1, when updating %%{nspr_version} +# - increment %%{nspr_version}, when updating the NSS part only +%global nspr_release 7 %global nss_version 3.58.0 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global saved_files_dir %{_libdir}/nss/saved @@ -50,7 +53,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM", Summary: Network Security Services Name: nss Version: %{nss_version} -Release: 6%{?dist} +Release: 7%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Requires: nspr >= %{nspr_version} @@ -270,7 +273,7 @@ memory management (malloc and free) and shared library linking. Summary: Development libraries for the Netscape Portable Runtime Version: %{nspr_version} Release: %{nspr_release}%{?dist} -Requires: nspr = %{nspr_version}-%{nspr_release} +Requires: nspr%{?_isa} = %{nspr_version}-%{nspr_release}%{?dist} Requires: pkgconfig BuildRequires: xmlto Conflicts: filesystem < 3 @@ -1045,6 +1048,9 @@ update-crypto-policies &> /dev/null || : %changelog +* Fri Oct 30 2020 Daiki Ueno - 3.58.0-7 +- Use the lockstep release numbering for both nspr and nss + * Thu Oct 29 2020 Jeff Law - 3.58.0-6 - Disable -Warray-parameter warning for gcc-11