commit c52f3cc1e1137d3ccc1d6a8ece47e555d5f87001 Author: Vasiliy Glazov <vascom2(a)gmail.com&gt; Date: Wed Sep 11 16:35:37 2019 +0300 Correct spec according to Fedora original. chromium-freeworld.spec | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 737aad6..dddccd7 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -105,10 +105,6 @@ BuildRequires: libicu-devel >= 5.4 # 2017-06-08. %global bundlelibxml 1 -# Fedora's Python 2 stack is being removed, we use the bundled Python libraries -# This can be revisited once we upgrade to Python 3 -%global bundlepylibs 1 - # Chromium used to break on wayland, hidpi, and colors with gtk3 enabled. # Hopefully it does not anymore. %global gtk3 1 @@ -521,11 +517,8 @@ BuildRequires: pkgconfig(gtk+-3.0) %else BuildRequires: pkgconfig(gtk+-2.0) %endif -BuildRequires: /usr/bin/python2 -%if 0%{?bundlepylibs} -# Using bundled bits, do nothing. -%else -%if 0%{?fedora} +BuildRequires: python2-devel +%if 0%{?fedora} > 27 BuildRequires: python2-beautifulsoup4 BuildRequires: python2-beautifulsoup BuildRequires: python2-html5lib @@ -539,8 +532,6 @@ BuildRequires: python-markupsafe BuildRequires: python-ply %endif BuildRequires: python2-simplejson -BuildRequires: python2-devel -%endif %if 0%{?bundlere2} # Using bundled bits, do nothing. %else @@ -1269,7 +1260,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ %endif 'third_party/lss' \ 'third_party/lzma_sdk' \ -%if 0%{?bundlepylibs} +%if 0 'third_party/markupsafe' \ %endif 'third_party/mesa' \ @@ -1357,12 +1348,10 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'v8/third_party/inspector_protocol' \ --do-remove -%if ! 0%{?bundlepylibs} # Look, I don't know. This package is spit and chewing gum. Sorry. rm -rf third_party/markupsafe ln -s %{python2_sitearch}/markupsafe third_party/markupsafe # We should look on removing other python2 packages as well i.e. ply -%endif # Fix hardcoded path in remoting code sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux.cc