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

Test module build, use flatpak global define, Added fix for F31 (mozbz#1533969) - minor fix

Browse Source
This commit is contained in:
Martin Stransky 2019-03-22 14:58:09 +01:00
parent ec310c76e1
commit 10d0e02bf3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firefox.spec
View File

@ -203,7 +203,7 @@ BuildRequires: clang-libs
%if 0%{?build_with_clang} %if 0%{?build_with_clang}
BuildRequires: lld BuildRequires: lld
%endif %endif
%if !0{?flatpak} %if !0%{?flatpak}
%if 0%{?fedora} > 28 %if 0%{?fedora} > 28
BuildRequires: pipewire-devel BuildRequires: pipewire-devel
%endif %endif
@ -221,7 +221,7 @@ Requires: nspr >= %{nspr_build_version}
Requires: nss >= %{nss_build_version} Requires: nss >= %{nss_build_version}
%endif %endif
BuildRequires: python2-devel BuildRequires: python2-devel
%if !0{?flatpak} %if !0%{?flatpak}
Requires: u2f-hidraw-policy Requires: u2f-hidraw-policy
%endif %endif
@ -247,7 +247,7 @@ Requires: nss >= 3.29.3-1.1
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%if !0{?flatpak} %if !0%{?flatpak}
BuildRequires: system-bookmarks BuildRequires: system-bookmarks
%endif %endif
%if %{?system_ffi} %if %{?system_ffi}
@ -365,7 +365,7 @@ This package contains results of tests executed during build.
%endif %endif
# Wayland specific upstream patches # Wayland specific upstream patches
%if !0{?flatpak} %if !0%{?flatpak}
%if 0%{?fedora} > 28 %if 0%{?fedora} > 28
%patch574 -p1 -b .firefox-pipewire %patch574 -p1 -b .firefox-pipewire
%endif %endif
@ -630,7 +630,7 @@ rm -f objdir/dist/bin/pk12util
%install %install
# set up our default bookmarks # set up our default bookmarks
%if !0{?flatpak} %if !0%{?flatpak}
%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
%endif %endif