diff --git a/.gitignore b/.gitignore index c3963b0..8f7a423 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nspr-4.34.tar.gz +SOURCES/nspr-4.35.tar.gz diff --git a/.nspr.metadata b/.nspr.metadata index 3d1d43d..eb20c28 100644 --- a/.nspr.metadata +++ b/.nspr.metadata @@ -1 +1 @@ -efea1385dc83c55018183257036206b5f2c77c59 SOURCES/nspr-4.34.tar.gz +71267859a581d61fea8d7d36c25f716750271cac SOURCES/nspr-4.35.tar.gz diff --git a/SPECS/nspr.spec b/SPECS/nspr.spec index 27249a4..4216f97 100644 --- a/SPECS/nspr.spec +++ b/SPECS/nspr.spec @@ -1,4 +1,4 @@ -%global nspr_version 4.34.0 +%global nspr_version 4.35.0 # The upstream omits the trailing ".0", while we need it for # consistency with the pkg-config version: @@ -11,7 +11,7 @@ rpm.define(string.format("nspr_archive_version %s", Summary: Netscape Portable Runtime Name: nspr Version: %{nspr_version} -Release: 3.1%{?dist} +Release: 1%{?dist} License: MPLv2.0 URL: http://ftp.mozilla.org/pub/nspr/releases/v${nspr_archive_version}/src Group: System Environment/Libraries @@ -60,11 +60,11 @@ Header files for doing development with the Netscape Portable Runtime. # that go into nspr.pc for pkg-config. cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in -%patch1 -p0 -b .flags -%patch2 -p0 +%patch -P1 -p0 -b .flags +%patch -P2 -p0 pushd nspr -%patch10 -p1 -b .coverity -%patch11 -p1 -b .passive +%patch -P10 -p1 -b .coverity +%patch -P11 -p1 -b .passive popd %build @@ -162,6 +162,10 @@ done %{_mandir}/man*/* %changelog +* Wed Jun 28 2023 Frantisek Krenzelok - 4.35.0-1 +- Rebase to NSPR 4.35 for firefox 115 +- Move from deprecate %patchN format + * Wed Aug 3 2022 Bob Relyea - 4.34.0-3.1 - Actually apply the patch in -3