Mass rebuild messed up nss/nspr versioning, straighten that out now.
https://bugzilla.redhat.com/show_bug.cgi?id=1986522
This commit is contained in:
parent
8a77a14ab9
commit
ff3ede0b35
14
nss.spec
14
nss.spec
@ -1,9 +1,10 @@
|
||||
%global nspr_version 4.31.0
|
||||
%global nss_version 3.67.0
|
||||
# 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 1
|
||||
%global nss_version 3.67.0
|
||||
%global nspr_release 2
|
||||
%global nss_release 3
|
||||
# only need to update this as we added new
|
||||
# algorithms under nss policy control
|
||||
%global crypto_policies_version 20210118
|
||||
@ -56,7 +57,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: %{nss_version}
|
||||
Release: 2%{?dist}
|
||||
Release: %{nss_release}%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Requires: nspr >= %{nspr_version}
|
||||
@ -260,7 +261,7 @@ Header and library files for doing development with Network Security Services.
|
||||
%package -n nspr
|
||||
Summary: Netscape Portable Runtime
|
||||
Version: %{nspr_version}
|
||||
Release: %{nspr_release}%{?dist}.1
|
||||
Release: %{nspr_release}%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/nspr/
|
||||
Conflicts: filesystem < 3
|
||||
@ -275,7 +276,7 @@ memory management (malloc and free) and shared library linking.
|
||||
%package -n nspr-devel
|
||||
Summary: Development libraries for the Netscape Portable Runtime
|
||||
Version: %{nspr_version}
|
||||
Release: %{nspr_release}%{?dist}.1
|
||||
Release: %{nspr_release}%{?dist}
|
||||
Requires: nspr%{?_isa} = %{nspr_version}-%{nspr_release}%{?dist}
|
||||
Requires: pkgconfig
|
||||
BuildRequires: xmlto
|
||||
@ -1056,6 +1057,9 @@ update-crypto-policies &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 27 2021 Bob Relyea <rrelyea@redhat.com> - 3.67.0-3
|
||||
- rpmdev-bumpspec doesn't work correctly with nss/nspr. Fixup version numbers
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.67.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user