[chromium-freeworld: 1/3] check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on b

commit 6588e7bdd3acbad84209cd63daa4fe7738d2858a Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Wed Mar 28 10:01:28 2018 -0400 check that there is no system google module, shadowing bundled ones :: conditionalize api keys (on by default) chromium.spec | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) --- diff --git a/chromium.spec b/chromium.spec index 845e712..4f76103 100644 --- a/chromium.spec +++ b/chromium.spec @@ -6,6 +6,10 @@ %global lsuffix fedora %endif +# Some people wish not to use the Fedora Google API keys. Mmkay. +# Expect stuff to break in weird ways if you disable. +%global useapikeys 1 + # Leave this alone, please. %global target out/Release %global headlesstarget out/Headless @@ -110,10 +114,17 @@ BuildRequires: libicu-devel >= 5.4 ### Note: These are for Fedora use ONLY. ### For your own distribution, please get your own set of keys. ### http://lists.debian.org/debian-legal/2013/11/msg00006.html +%if %{useapikeys} %global api_key AIzaSyDUIXvzVrt5OkVsgXhQ6NFfvWlA44by-aw %global default_client_id 449907151817.apps.googleusercontent.com %global default_client_secret miEreAep8nuvTdvLums6qyLK %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com +%else +%global api_key %nil +%global default_client_id %nil +%global default_client_secret %nil +%global chromoting_client_id %nil +%endif %global majorversion 65 @@ -1130,6 +1141,12 @@ sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"| . /opt/rh/devtoolset-7/enable %endif +# Check that there is no system 'google' module, shadowing bundled ones: +if python -c 'import google ; print google.__path__' 2> /dev/null ; then \ + echo "Python 'google' module is defined, this will shadow modules of this build"; \ + exit 1 ; \ +fi + tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target} @@ -1597,6 +1614,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Mar 28 2018 Tom Callaway <spot(a)fedoraproject.org&gt; +- check that there is no system 'google' module, shadowing bundled ones +- conditionalize api keys (on by default) + * Wed Mar 21 2018 Tom Callaway <spot(a)fedoraproject.org&gt; 65.0.3325.181-1 - update to 65.0.3325.181