Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-08-04 17:25:55 +03:00 committed by eabdullin
commit 6f633d1055
3 changed files with 11 additions and 9 deletions

View File

@ -1,5 +1,5 @@
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
c4754e71b61165ea4c3c0631875d57cd5533cde7 SOURCES/firefox-102.13.0esr.b2.processed-source.tar.xz
47c2292880afb9c3ebd9a5d1b1c00717d021a36c SOURCES/firefox-langpacks-102.13.0esr-20230630.tar.xz
0e0c74dd2dfb47c49323408dc705b2dd68acd2db SOURCES/firefox-102.14.0esr.processed-source.tar.xz
0a1f9441c747165fccf4d20691862e804678867f SOURCES/firefox-langpacks-102.14.0esr-20230725.tar.xz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.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/firefox-102.13.0esr.b2.processed-source.tar.xz
SOURCES/firefox-langpacks-102.13.0esr-20230630.tar.xz
SOURCES/firefox-102.14.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-102.14.0esr-20230725.tar.xz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-11.el8_1.src.rpm

View File

@ -219,8 +219,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 102.13.0
Release: 2%{?dist}.alma
Version: 102.14.0
Release: 1%{?dist}.alma
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -228,7 +228,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# 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
%if 0%{?rhel} == 9
ExcludeArch: %{ix86}
@ -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
Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20230630.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20230725.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -1474,9 +1474,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Fri Jul 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.13.0-2.alma
* Fri Aug 04 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.14.0-1.alma
- Debrand for AlmaLinux
* Tue Jul 25 2023 Eike Rathke <erack@redhat.com> - 102.14.0-1
- Update to 102.14.0 build1
* Fri Jun 30 2023 Eike Rathke <erack@redhat.com> - 102.13.0-2
- Update to 102.13.0 build2
* Thu Jun 29 2023 Eike Rathke <erack@redhat.com> - 102.13.0-1