summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2017-03-13 14:52:10 +0100
committerMartin Stransky <stransky@redhat.com>2017-03-13 14:52:10 +0100
commit6458ff17cef6927d388e9ce7902b2801e9975d68 (patch)
treeea13da5b476bf38a1ba97af5c8500f0b55c5a945 /firefox.spec
parentMerge branch 'master' into f24 (diff)
parentUpdated nss patch ordering (diff)
downloadlibrewolf-fedora-ff-6458ff17cef6927d388e9ce7902b2801e9975d68.tar.gz
librewolf-fedora-ff-6458ff17cef6927d388e9ce7902b2801e9975d68.tar.bz2
librewolf-fedora-ff-6458ff17cef6927d388e9ce7902b2801e9975d68.zip
Merge branch 'master' into f24
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec11
1 files 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
bgstack15