Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2024-05-20 06:59:25 +00:00 committed by eabdullin
commit c493cb5a06
3 changed files with 10 additions and 8 deletions

View File

@ -1,6 +1,6 @@
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
d20eb93d03020aaeaf53cb59ea9febda3420e7c0 SOURCES/firefox-115.10.0esr.processed-source.tar.xz 390c5bc3d9df2baf3e969203e4827e096c4c7f69 SOURCES/firefox-115.11.0esr.processed-source.tar.xz
26d7084ec0caa9dff114cdb3fab8cae0c46ba4b4 SOURCES/firefox-langpacks-115.10.0esr-20240409.tar.xz 11b5c428a7e73076351e2d0e344e513db8186a04 SOURCES/firefox-langpacks-115.11.0esr-20240507.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm 9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-115.10.0esr.processed-source.tar.xz SOURCES/firefox-115.11.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-115.10.0esr-20240409.tar.xz SOURCES/firefox-langpacks-115.11.0esr-20240507.tar.xz
SOURCES/mochitest-python.tar.gz SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.90.0-3.el8_1.src.rpm SOURCES/nss-3.90.0-3.el8_1.src.rpm

View File

@ -36,7 +36,7 @@ function dist_to_rhel_minor(str, start)
end end
match = string.match(str, ".el9") match = string.match(str, ".el9")
if match then if match then
return 4 return 5
end end
return -1 return -1
end} end}
@ -132,7 +132,7 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 115.10.0 Version: 115.11.0
Release: 1%{?dist}.alma.1 Release: 1%{?dist}.alma.1
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -163,7 +163,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 # 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 Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks} %if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20240409.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20240507.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1740,9 +1740,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Apr 19 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.10.0-1.alma.1 * Mon May 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.11.0-1.alma.1
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Tue May 07 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Update to 115.11.0 build1
* Tue Apr 09 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1 * Tue Apr 09 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1 - Update to 115.10.0 build1
* Tue Apr 09 2024 Jan Horak <jhorak@redhat.com> - 115.9.1-2 * Tue Apr 09 2024 Jan Horak <jhorak@redhat.com> - 115.9.1-2