rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f24

Browse Source
This commit is contained in:
Martin Stransky 2017-03-13 14:52:10 +01:00
commit 6458ff17ce
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firefox.spec
View File

@ -142,12 +142,9 @@ Patch225: mozilla-1005640-accept-lang.patch
#ARM run-time patch #ARM run-time patch
Patch226: rhbz-1354671.patch Patch226: rhbz-1354671.patch
%if 0%{?fedora} > 25
# Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm # Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm
Patch227: rhbz-1400293-fix-mozilla-1324096.patch Patch227: rhbz-1400293-fix-mozilla-1324096.patch
%else Patch228: rhbz-1400293-workaround.patch
Patch227: rhbz-1400293-workaround.patch
%endif
# Upstream patches # Upstream patches
Patch304: mozilla-1253216.patch Patch304: mozilla-1253216.patch
@ -306,7 +303,13 @@ cd %{tarballdir}
%ifarch aarch64 %ifarch aarch64
%patch226 -p1 -b .1354671 %patch226 -p1 -b .1354671
%endif %endif
%if 0%{?fedora} > 25
# Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm
%patch227 -p1 -b .rh1400293 %patch227 -p1 -b .rh1400293
%else
%patch228 -p1 -b .rh1400293
%endif
%patch304 -p1 -b .1253216 %patch304 -p1 -b .1253216
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777