From c2da6052e5a838fc3fb955c51d8f361d155736e2 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 7 Oct 2022 12:19:33 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/distribution.ini | 10 +++++----- ...-prefs.js => firefox-almalinux-default-prefs.js} | 4 ++-- SPECS/firefox.spec | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) rename SOURCES/{firefox-redhat-default-prefs.js => firefox-almalinux-default-prefs.js} (92%) 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-almalinux-default-prefs.js similarity index 92% rename from SOURCES/firefox-redhat-default-prefs.js rename to SOURCES/firefox-almalinux-default-prefs.js index 9ead3a2..6a2c6bf 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-almalinux-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://www.almalinux.org"); +pref("startup.homepage_welcome_url", "http://www.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 9db388f..27084f8 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -91,6 +91,8 @@ end} # Build as a debug package? %global debug_build 0 +%global dist %{?dist}.alma + # We need to use full path because of flatpak where datadir is /app/share %global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -166,10 +168,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220817.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 +Source12: firefox-almalinux-default-prefs.js %endif Source20: firefox.desktop Source21: firefox.sh.in @@ -1162,9 +1161,6 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries %{__mkdir_p} %{buildroot}%{mozappdir}/distribution %{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution -%if 0%{?centos} -sed -i -e 's|Red Hat Enterprise|CentOS|' %{buildroot}%{mozappdir}/distribution/distribution.ini -%endif # Remove copied libraries to speed up build rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so @@ -1271,6 +1267,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Oct 07 2022 Eduard Abdullin - 91.13.0-1.alma +- Debrand for AlmaLinux + * Wed Aug 17 2022 Eike Rathke - 91.13.0-1 - Update to 91.13.0 build1