Merge branch 'c8' into a8

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.redhat=redhat
+app.distributor=almalinux
+app.distributor.channel=almalinux
+app.partner.fedora=almalinux

SPECS/firefox.spec

@@ -14,39 +14,39 @@
 
 %{lua:
 function dist_to_rhel_minor(str, start)
-  match = string.match(str, ".module%+el8.%d+")
-  if match then
-     return string.sub(match, 13)
-  end
-  match = string.match(str, ".el8_%d+")
-  if match then
-     return string.sub(match, 6)
-  end
-  match = string.match(str, ".el8")
-  if match then
-     return 10
-  end
-  match = string.match(str, ".module%+el9.%d+")
-  if match then
-     return string.sub(match, 13)
-  end
-  match = string.match(str, ".el9_%d+")
-  if match then
-     return string.sub(match, 6)
-  end
-  match = string.match(str, ".el9")
-  if match then
-     return 5
-  end
-  match = string.match(str, ".el10_%d+")
-  if match then
-     return string.sub(match, 7)
-  end
-  match = string.match(str, ".el10")
-  if match then
-     return 0
-  end
-  return -1
+match = string.match(str, ".module%+el8.%d+")
+if match then
+return string.sub(match, 13)
+end
+match = string.match(str, ".el8_%d+")
+if match then
+return string.sub(match, 6)
+end
+match = string.match(str, ".el8")
+if match then
+return 10
+end
+match = string.match(str, ".module%+el9.%d+")
+if match then
+return string.sub(match, 13)
+end
+match = string.match(str, ".el9_%d+")
+if match then
+return string.sub(match, 6)
+end
+match = string.match(str, ".el9")
+if match then
+return 5
+end
+match = string.match(str, ".el10_%d+")
+if match then
+return string.sub(match, 7)
+end
+match = string.match(str, ".el10")
+if match then
+return 0
+end
+return -1
 end}
 
 %global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
@@ -60,16 +60,16 @@ end}
 %global system_nss        0
 %endif
 %if 0%{?rhel} == 8
-  %if %{rhel_minor_version} < 8
-    %global bundle_nss        1
-    %global system_nss        1
-  %endif
+%if %{rhel_minor_version} < 8
+%global bundle_nss        1
+%global system_nss        1
+%endif
 %endif
 %if 0%{?rhel} == 9
-  %if %{rhel_minor_version} < 2
-    %global bundle_nss        1
-    %global system_nss        1
-  %endif
+%if %{rhel_minor_version} < 2
+%global bundle_nss        1
+%global system_nss        1
+%endif
 %endif
 
 %global dts_version       11
@@ -98,11 +98,11 @@ end}
 %endif
 
 %if 0%{?rhel} == 7
-  %global use_dts          1
-  %global use_nodejs_scl   1
-  %global nodejs_build_req rh-nodejs10-nodejs
-  %global llvm_version     11.0
-  %global use_python3_scl  1
+%global use_dts          1
+%global use_nodejs_scl   1
+%global nodejs_build_req rh-nodejs10-nodejs
+%global llvm_version     11.0
+%global use_python3_scl  1
 %endif
 
 %if 0%{?disable_toolsets}
@@ -113,9 +113,9 @@ end}
 
 %global launch_wayland_compositor 0
 %if 0%{?run_firefox_tests}
-  %global test_on_wayland           1
-  %global launch_wayland_compositor 1
-  %global build_tests               1
+%global test_on_wayland           1
+%global launch_wayland_compositor 1
+%global build_tests               1
 %endif
 
 
@@ -138,7 +138,7 @@ end}
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        128.3.1
-Release:        2%{?dist}
+Release:        2%{?dist}.alma.1
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -1720,13 +1720,6 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
 %{__mkdir_p} %{buildroot}%{mozappdir}/distribution
 %{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution
 
-# CentOS
-%if 0%{?centos}
-%{__sed} -ie 's/redhat/centos/g' %{buildroot}%{mozappdir}/distribution
-(source  /etc/os-release; %{__sed} -ie 's/Red Hat Enterprise Linux/$NAME/' %{buildroot}%{mozappdir}/distribution)
-cat %{buildroot}%{mozappdir}/distribution
-%endif
-
 # Install appdata file
 mkdir -p %{buildroot}%{_datadir}/metainfo
 %{__sed} -e "s/__VERSION__/%{version}/" \
@@ -1860,6 +1853,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Oct 11 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.3.1-1.alma.1
+- Debrand for AlmaLinux
+
 * Wed Oct 09 2024 Jan Horak <jhorak@redhat.com> - 128.3.1-1
 - Update to 128.3.1
 
@@ -2368,4 +2364,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Thu Dec  8 2016 Jan Horak <jhorak@redhat.com> - 52.0-0.5
 - Firefox Aurora 52 testing build
-