From a9aae0dca7c110fde46f47fe84b6b3175ce3203e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 13 Mar 2017 14:51:56 +0100 Subject: [PATCH] Updated nss patch ordering --- firefox.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/firefox.spec b/firefox.spec index 0c1c917..71b1bb8 100644 --- a/firefox.spec +++ b/firefox.spec @@ -142,12 +142,9 @@ Patch225: mozilla-1005640-accept-lang.patch #ARM run-time patch Patch226: rhbz-1354671.patch -%if 0%{?fedora} > 25 # Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm Patch227: rhbz-1400293-fix-mozilla-1324096.patch -%else -Patch227: rhbz-1400293-workaround.patch -%endif +Patch228: rhbz-1400293-workaround.patch # Upstream patches Patch304: mozilla-1253216.patch @@ -306,7 +303,13 @@ cd %{tarballdir} %ifarch aarch64 %patch226 -p1 -b .1354671 %endif + +%if 0%{?fedora} > 25 + # Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm %patch227 -p1 -b .rh1400293 +%else +%patch228 -p1 -b .rh1400293 +%endif %patch304 -p1 -b .1253216 %patch402 -p1 -b .1196777