From 86c8e1c7370767bde4ccc5624bada0025362be79 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Thu, 14 Dec 2023 16:23:06 +0300 Subject: [PATCH] Drop distribution info from About dialog (INF-733) & fixup! Disable telemetry by default --- SOURCES/firefox-mozconfig | 3 ++- SPECS/firefox.spec | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/SOURCES/firefox-mozconfig b/SOURCES/firefox-mozconfig index e91a5e5..b792ca5 100644 --- a/SOURCES/firefox-mozconfig +++ b/SOURCES/firefox-mozconfig @@ -20,9 +20,10 @@ ac_add_options --without-wasm-sandboxed-libraries ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 export MOZ_UPDATE_CHANNEL=release export MOZ_APP_REMOTINGNAME=firefox mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir +# Disable telemetry +unset MOZ_TELEMETRY_REPORTING diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 5447c1e..d855782 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -201,7 +201,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.9.0 -Release: 3%{?dist}.inferit.2 +Release: 3%{?dist}.inferit.3 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -1320,9 +1320,10 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries # Copy over run-mozilla.sh %{__cp} build/unix/run-mozilla.sh %{buildroot}%{mozappdir} -# Add distribution.ini -%{__mkdir_p} %{buildroot}%{mozappdir}/distribution -%{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution +# Drop distribution info from About dialog (INF-733) +## Add distribution.ini +##%%{__mkdir_p} %{buildroot}%{mozappdir}/distribution +##%%{__cp} %%{SOURCE26} %{buildroot}%{mozappdir}/distribution # Install appdata file mkdir -p %{buildroot}%{_datadir}/metainfo @@ -1410,7 +1411,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/defaults/preferences/* %{mozappdir}/browser/defaults/preferences %{mozappdir}/browser/features/*.xpi -%{mozappdir}/distribution/distribution.ini +##%{mozappdir}/distribution/distribution.ini # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %if %{with langpacks} @@ -1471,6 +1472,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Dec 14 2023 Sergey Cherevko - 102.9.0-3.inferit.3 +- Drop distribution info from About dialog (INF-733) (Arkady L. Shane ) +- fixup! Disable telemetry and geolocation by default + * Fri Sep 15 2023 Sergey Cherevko - 102.9.0-3.inferit.2 - INF-613 import bookmarks from system-bookmarks (Arkady L. Shane ) - Rebuilt for MSVSphere 8.8