diff --git a/nss.spec b/nss.spec index 82c0743..c3d7149 100644 --- a/nss.spec +++ b/nss.spec @@ -201,7 +201,7 @@ v3 certificates, and other security standards. %package tools Summary: Tools for the Network Security Services -Requires: %{name}%{?_isa} = %{nss_version}-%{nss_release} +Requires: %{name}%{?_isa} = %{nss_version}-%{nss_release}%{dist} %description tools Network Security Services (NSS) is a set of libraries designed to @@ -218,7 +218,7 @@ Summary: System NSS Initialization # providing nss-system-init without version so that it can # be replaced by a better one, e.g. supplied by the os vendor Provides: nss-system-init -Requires: nss%{?_isa} = %{nss_version}-%{nss_release} +Requires: nss%{?_isa} = %{nss_version}-%{nss_release}%{dist} Requires(post): coreutils, sed %description sysinit @@ -229,8 +229,8 @@ any system or user configured modules. %package devel Summary: Development libraries for Network Security Services -Provides: nss-static = %{nss_version}-%{nss_release} -Requires: nss%{?_isa} = %{nss_version}-%{nss_release} +Provides: nss-static = %{nss_version}-%{nss_release}%{dist} +Requires: nss%{?_isa} = %{nss_version}-%{nss_release}%{dist} Requires: nss-util-devel Requires: nss-softokn-devel Requires: nspr-devel >= %{nspr_version} @@ -243,9 +243,9 @@ Header and Library files for doing development with Network Security Services. %package pkcs11-devel Summary: Development libraries for PKCS #11 (Cryptoki) using NSS -Provides: nss-pkcs11-devel-static = %{nss_version}-%{nss_release} -Requires: nss-devel = %{nss_version}-%{nss_release} -Requires: nss-softokn-freebl-devel = %{nss_version}-%{nss_release} +Provides: nss-pkcs11-devel-static = %{nss_version}-%{nss_release}%{dist} +Requires: nss-devel = %{nss_version}-%{nss_release}%{dist} +Requires: nss-softokn-freebl-devel = %{nss_version}-%{nss_release}%{dist} %description pkcs11-devel Library files for developing PKCS #11 modules using basic NSS @@ -261,7 +261,7 @@ Utilities for Network Security Services and the Softoken module %package util-devel Summary: Development libraries for Network Security Services Utilities -Requires: nss-util%{?_isa} = %{nss_version}-%{nss_release} +Requires: nss-util%{?_isa} = %{nss_version}-%{nss_release}%{dist} Requires: nspr-devel >= %{nspr_version} Requires: pkgconfig @@ -272,8 +272,8 @@ Header and library files for doing development with Network Security Services. %package softokn Summary: Network Security Services Softoken Module Requires: nspr >= %{nspr_version} -Requires: nss-util >= %{nss_version}-%{nss_release} -Requires: nss-softokn-freebl%{_isa} >= %{nss_version}-%{nss_release} +Requires: nss-util >= %{nss_version}-%{nss_release}%{dist} +Requires: nss-softokn-freebl%{_isa} >= %{nss_version}-%{nss_release}%{dist} %description softokn Network Security Services Softoken Cryptographic Module @@ -294,8 +294,8 @@ Install the nss-softokn-freebl package if you need the freebl library. %package softokn-freebl-devel Summary: Header and Library files for doing development with the Freebl library for NSS -Provides: nss-softokn-freebl-static = %{nss_version}-%{nss_release} -Requires: nss-softokn-freebl%{?_isa} = %{nss_version}-%{nss_release} +Provides: nss-softokn-freebl-static = %{nss_version}-%{nss_release}%{dist} +Requires: nss-softokn-freebl%{?_isa} = %{nss_version}-%{nss_release}%{dist} %description softokn-freebl-devel NSS Softoken Cryptographic Module Freebl Library Development Tools @@ -306,10 +306,10 @@ Developers should rely only on the officially supported NSS public API. %package softokn-devel Summary: Development libraries for Network Security Services -Requires: nss-softokn%{?_isa} = %{nss_version}-%{nss_release} -Requires: nss-softokn-freebl-devel%{?_isa} = %{nss_version}-%{nss_release} +Requires: nss-softokn%{?_isa} = %{nss_version}-%{nss_release}%{dist} +Requires: nss-softokn-freebl-devel%{?_isa} = %{nss_version}-%{nss_release}%{dist} Requires: nspr-devel >= %{nspr_version} -Requires: nss-util-devel >= %{nss_version}-%{nss_release} +Requires: nss-util-devel >= %{nss_version}-%{nss_release}%{dist} Requires: pkgconfig %description softokn-devel @@ -350,17 +350,17 @@ Header files for doing development with the Netscape Portable Runtime. mv ../nspr-%{nspr_archive_version}/nspr . cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in -%patch100 -p0 -b .flags +%patch -P 100 -p0 -b .flags pushd nspr -%patch101 -p1 -b .gcc-atomics -%patch110 -p1 -b .coverity -%patch120 -p1 -b .server-passive +%patch -P 101 -p1 -b .gcc-atomics +%patch -P 110 -p1 -b .coverity +%patch -P 120 -p1 -b .server-passive popd pushd nss %autopatch -p1 -M 99 -%patch300 -R -p1 +%patch -P 300 -R -p1 popd # copy the fips_algorithms.h for this release @@ -1170,6 +1170,10 @@ update-crypto-policies &> /dev/null || : %changelog +* Wed Jun 28 2023 Frantisek Krenzelok - 3.90.0-1 +- fix missing dist tag in packages version +- move from deprecate %patch format + * Mon Jun 12 2023 Bob Relyea - 3.90.0-1 - Rebase to NSS-3.90 - Rebase to NSPR-3.35