Merge branch 'master' into f23
This commit is contained in:
commit
e4c8070746
@ -43,7 +43,7 @@
|
|||||||
# Build as a debug package?
|
# Build as a debug package?
|
||||||
%define debug_build 0
|
%define debug_build 0
|
||||||
|
|
||||||
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
||||||
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||||
# Minimal required versions
|
# Minimal required versions
|
||||||
%global cairo_version 1.13.1
|
%global cairo_version 1.13.1
|
||||||
@ -194,8 +194,6 @@ Requires: sqlite >= %{sqlite_build_version}
|
|||||||
BuildRequires: pkgconfig(libffi)
|
BuildRequires: pkgconfig(libffi)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: system-bookmarks
|
|
||||||
|
|
||||||
%if %{?run_tests}
|
%if %{?run_tests}
|
||||||
BuildRequires: xorg-x11-server-Xvfb
|
BuildRequires: xorg-x11-server-Xvfb
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user