Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2024-07-11 16:39:50 +03:00
commit 9795b91903
3 changed files with 18 additions and 9 deletions

View File

@ -1,6 +1,6 @@
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
820717fcb4ec429ccf7f49cf9c10612d27dadc09 SOURCES/firefox-115.12.0esr.processed-source.tar.xz 93628abf3069e944a9b10fa05ae30827ef3f935d SOURCES/firefox-115.13.0esr.b3.processed-source.tar.xz
3b6cc16c53c37017fbd31ee47c9d2a5f0c84dfda SOURCES/firefox-langpacks-115.12.0esr-20240604.tar.xz b13a347da2fdc06cc06ab001e2455afb641b4951 SOURCES/firefox-langpacks-115.13.0esr-20240708.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.12.0esr.processed-source.tar.xz SOURCES/firefox-115.13.0esr.b3.processed-source.tar.xz
SOURCES/firefox-langpacks-115.12.0esr-20240604.tar.xz SOURCES/firefox-langpacks-115.13.0esr-20240708.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

@ -122,7 +122,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # 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 # firefox-102.8.0esr.b2.processed-source.tar.xz
# When unset use processed source file name as is. # When unset use processed source file name as is.
##global buildnum .b2 %global buildnum .b3
%bcond_without langpacks %bcond_without langpacks
@ -132,8 +132,8 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 115.12.0 Version: 115.13.0
Release: 1%{?dist}.alma.1 Release: 3%{?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}-20240604.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20240708.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,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Jun 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 115.12.0-1.alma.1 * Thu Jul 11 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.13.0-3.alma.1
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Mon Jul 08 2024 Tomas Popela <tpopela@redhat.com> - 115.13.0-3
- Update to 115.13.0 build3
* Tue Jul 02 2024 Eike Rathke <erack@redhat.com> - 115.13.0-2
- Update to 115.13.0 build2
* Mon Jul 01 2024 Eike Rathke <erack@redhat.com> - 115.13.0-1
- Update to 115.13.0 build1
* Tue Jun 04 2024 Eike Rathke <erack@redhat.com> - 115.12.0-1 * Tue Jun 04 2024 Eike Rathke <erack@redhat.com> - 115.12.0-1
- Update to 115.12.0 build1 - Update to 115.12.0 build1