Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-09-20 11:42:30 +03:00 committed by eabdullin
commit fe84804e74
3 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
6b087cdb999b9e8df63669d68163da66977d46e0 SOURCES/firefox-102.15.0esr.processed-source.tar.xz 17154a4f25191801a829b403bd343555ddc88bdc SOURCES/firefox-102.15.1esr.processed-source.tar.xz
5540d2d808bf7e24555d85e19d79aeec47c0c977 SOURCES/firefox-langpacks-102.15.0esr-20230824.tar.xz 7a5750e2bbd11bbb3386017b350bdcc2297bc111 SOURCES/firefox-langpacks-102.15.1esr-20230913.tar.xz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-102.15.0esr.processed-source.tar.xz SOURCES/firefox-102.15.1esr.processed-source.tar.xz
SOURCES/firefox-langpacks-102.15.0esr-20230824.tar.xz SOURCES/firefox-langpacks-102.15.1esr-20230913.tar.xz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-11.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm

View File

@ -219,7 +219,7 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 102.15.0 Version: 102.15.1
Release: 1%{?dist}.alma Release: 1%{?dist}.alma
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+
@ -250,7 +250,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}-20230824.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20230913.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1474,9 +1474,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Sep 05 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.0-1.alma * Wed Sep 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.1-1.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Wed Sep 13 2023 Eike Rathke <erack@redhat.com> - 102.15.1-1
- Update to 102.15.1
* Thu Aug 24 2023 Eike Rathke <erack@redhat.com> - 102.15.0-1 * Thu Aug 24 2023 Eike Rathke <erack@redhat.com> - 102.15.0-1
- Update to 102.15.0 build2 - Update to 102.15.0 build2
* Wed Aug 09 2023 Eike Rathke <erack@redhat.com> - 102.14.0-3 * Wed Aug 09 2023 Eike Rathke <erack@redhat.com> - 102.14.0-3