summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2017-04-18 11:38:39 +0200
committerMartin Stransky <stransky@redhat.com>2017-04-18 11:38:39 +0200
commit40cc8469a394b6024fd4022a1e99b366ae249ad3 (patch)
tree3c3f2f8b742fe8783a6d4afab674764112886d24 /firefox.spec
parentMerge branch 'master' into f24 (diff)
parentbuild with nss 3.29.3 (diff)
downloadlibrewolf-fedora-ff-40cc8469a394b6024fd4022a1e99b366ae249ad3.tar.gz
librewolf-fedora-ff-40cc8469a394b6024fd4022a1e99b366ae249ad3.tar.bz2
librewolf-fedora-ff-40cc8469a394b6024fd4022a1e99b366ae249ad3.zip
Merge branch 'master' into f24
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/firefox.spec b/firefox.spec
index c4d94bd..e54310b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -141,10 +141,10 @@ Patch224: mozilla-1170092.patch
Patch225: mozilla-1005640-accept-lang.patch
#ARM run-time patch
Patch226: rhbz-1354671.patch
-
# Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm
Patch227: rhbz-1400293-fix-mozilla-1324096.patch
Patch228: rhbz-1400293-workaround.patch
+Patch229: firefox-nss-version.patch
# Upstream patches
Patch304: mozilla-1253216.patch
@@ -302,13 +302,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
+%patch229 -p1 -b .nss-version
%patch304 -p1 -b .1253216
%patch402 -p1 -b .1196777
bgstack15