From b077702a832e59b3d2aa19bd97f6e37588d482ee Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 17 May 2022 17:27:12 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/distribution.ini | 10 +++++----- SOURCES/firefox-redhat-default-prefs.js | 4 ++-- SPECS/firefox.spec | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 8bf461e..75e660e 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,9 +1,9 @@ [Global] -id=redhat +id=almalinux version=1.0 -about=Mozilla Firefox for Red Hat Enterprise Linux +about=Mozilla Firefox for AlmaLinux [Preferences] -app.distributor=redhat -app.distributor.channel=redhat -app.partner.fedora=redhat +app.distributor=almalinux +app.distributor.channel=almalinux +app.partner.fedora=almalinux diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index 9ead3a2..6e98e9c 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("startup.homepage_override_url", "http://almalinux.org/"); +pref("startup.homepage_welcome_url", "http://almalinux.org/"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 357d3dd..6a41bb6 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -25,6 +25,7 @@ end} %global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))} %global build_with_clang 0 +%global dist %{?dist}.alma %global system_nss 1 %global bundle_nss 0 @@ -159,11 +160,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220405.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -%if 0%{?centos} -Source12: firefox-centos-default-prefs.js -%else Source12: firefox-redhat-default-prefs.js -%endif Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -1268,6 +1265,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue May 17 2022 Eduard Abdullin - 91.8.0-1.alma +- Debrand for AlmaLinux + * Tue Apr 05 2022 Eike Rathke - 91.8.0-1 - Update to 91.8.0