summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-04-26 10:46:50 +0200
committerMartin Stransky <stransky@redhat.com>2016-04-26 10:46:50 +0200
commit28e12762e32b16cc9af46d16b5f38d03b8d74a2a (patch)
treedb877a58699ae1681866a91cb962dbc549c4d3e6 /firefox.spec
parentDon't use libvpx on F23 (diff)
parentAdded nasm.base64 build fix (mozbz#1266366) (diff)
downloadlibrewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.tar.gz
librewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.tar.bz2
librewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.zip
Merge branch 'master' into f24
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec6
1 files changed, 4 insertions, 2 deletions
diff --git a/firefox.spec b/firefox.spec
index 65ec592..d0301df 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -130,9 +130,10 @@ Patch304: mozilla-1253216.patch
Patch305: mozilla-1245076.patch
Patch306: mozilla-1245076-1.patch
Patch400: mozilla-1255590.patch
+Patch401: mozilla-1266366-branch64.patch
# Debian patches
-Patch401: mozilla-440908.patch
+Patch500: mozilla-440908.patch
%if %{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
@@ -277,9 +278,10 @@ cd %{tarballdir}
%patch305 -p1 -b .1245076
%patch306 -p1 -b .1245076-1
%patch400 -p1 -b .1255590
+%patch401 -p1 -b .1266366-branch64
# Debian extension patch
-%patch401 -p1 -b .440908
+%patch500 -p1 -b .440908
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
bgstack15