Merge branch 'master' into f28

This commit is contained in:
Martin Stransky 2018-12-06 12:09:21 +01:00
commit 1b96d953d6

View File

@ -37,9 +37,9 @@
%endif %endif
%global disable_elfhack 0 %global disable_elfhack 0
%if !0%{?build_with_clang} #%if !0%{?build_with_clang}
%global disable_elfhack 1 #%global disable_elfhack 1
%endif #%endif
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}