Import from CS git

This commit is contained in:
eabdullin 2025-05-05 11:40:49 +00:00
parent 8999f54d0a
commit 5b7bae2f93
3 changed files with 17 additions and 13 deletions

View File

@ -1,6 +1,6 @@
5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz
271e087aaa09420f7ae42972e7c5375b2a9c1bb5 SOURCES/firefox-128.9.0esr.b2.processed-source.tar.xz
2d4e4bfa9731134056380841228ad4a44a2ba3ac SOURCES/firefox-langpacks-128.9.0esr-20250331.tar.xz
11fa2914eeacd6f489a0cd232d9d7197e89f8df0 SOURCES/firefox-128.10.0esr.processed-source.tar.xz
0b5a3c7e89424e37ad84c57377342782b06f5dfb SOURCES/firefox-langpacks-128.10.0esr-20250422.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-128.9.0esr.b2.processed-source.tar.xz
SOURCES/firefox-langpacks-128.9.0esr-20250331.tar.xz
SOURCES/firefox-128.10.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-128.10.0esr-20250422.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.101.0-7.el8_2.src.rpm

View File

@ -40,7 +40,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 6
return 7
end
match = string.match(str, ".el10_%d+")
if match then
@ -48,7 +48,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el10")
if match then
return 0
return 1
end
return -1
end}
@ -118,7 +118,7 @@ end}
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
%global use_gcc_ts 1
%if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
# clang depends on gcc-toolset-14-gcc-c++
%global gts_version 14
%else
@ -156,7 +156,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
# firefox-102.8.0esr.b2.processed-source.tar.xz
# When unset use processed source file name as is.
%global buildnum .b2
#%%global buildnum .b2
%bcond_without langpacks
@ -166,8 +166,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 128.9.0
Release: 2%{?dist}
Version: 128.10.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -197,7 +197,7 @@ ExcludeArch: aarch64 s390 ppc
# Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz
Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20250331.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20250422.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -483,8 +483,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
BuildRequires: gcc-toolset-%{gts_version}-binutils
BuildRequires: gcc-toolset-%{gts_version}-gcc
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
# Do not explicitly require gcc-toolset-%{gts_version}-gcc-g++ instead fail
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
# when clang is upgraded to depend on a later toolset and adjust version.
# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
%endif
Requires: mozilla-filesystem
@ -1966,7 +1967,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/fonts/TwemojiMozilla.ttf
%{mozappdir}/glxtest
%{mozappdir}/vaapitest
%ifarch aarch64
%ifarch aarch64 riscv64
%{mozappdir}/v4l2test
%endif
@ -1988,6 +1989,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Tue Apr 22 2025 Eike Rathke <erack@redhat.com> - 128.10.0-1
- Update to 128.10.0 build1
* Mon Mar 31 2025 Eike Rathke <erack@redhat.com> - 128.9.0-2
- Update to 128.9.0 build2