Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-05-18 06:16:36 +00:00 committed by Stepan Oksanichenko
commit fd99a5867f
5 changed files with 18 additions and 14 deletions

View File

@ -1,6 +1,6 @@
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
4eb11930a11e5eee89647354e41ab5b91c132d0d SOURCES/firefox-102.10.0esr.processed-source.tar.xz
95f2f0cd510f0970cd1d1067a20f7396135e2506 SOURCES/firefox-langpacks-102.10.0esr-20230404.tar.xz
6aa448bcbabf2b9410b916e8290b0f58ee725186 SOURCES/firefox-102.11.0esr.b2.processed-source.tar.xz
a26fce6c1a21e026f550ee9e4431200ddd041e36 SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz
2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg
da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-102.10.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-102.10.0esr-20230404.tar.xz
SOURCES/firefox-102.11.0esr.b2.processed-source.tar.xz
SOURCES/firefox-langpacks-102.11.0esr-20230504.tar.xz
SOURCES/firefox-symbolic.svg
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm

View File

@ -17,8 +17,7 @@ pref("ui.SpellCheckerUnderlineStyle", 1);
pref("startup.homepage_override_url", "http://www.almalinux.org");
pref("startup.homepage_welcome_url", "http://www.almalinux.org");
pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html");
pref("media.gmp-gmpopenh264.provider.enabled",false);
pref("media.gmp-gmpopenh264.autoupdate",false);
pref("media.gmp-gmpopenh264.autoupdate",true);
pref("media.gmp-gmpopenh264.enabled",false);
pref("media.gmp.decoder.enabled", true);
pref("plugins.notifyMissingFlash", false);
@ -36,4 +35,4 @@ pref("browser.gnome-search-provider.enabled",true);
/* Enable ffvpx playback for WebRTC */
pref("media.navigator.mediadatadecoder_vpx_enabled", true);
/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
pref("storage.nfs_filesystem", true);
pref("storage.nfs_filesystem", true);

View File

@ -195,8 +195,8 @@ fi
# When Firefox is not running, restore SELinux labels for profile files
# (rhbz#1731371)
if [ $MOZILLA_DOWN -ne 0 ]; then
if [ -x $GETENFORCE_FILE ] && [ `$GETENFORCE_FILE` != "Disabled" ]; then
(/usr/sbin/restorecon -vr ~/.mozilla/firefox/* &)
if [ -x $GETENFORCE_FILE ] && [ `$GETENFORCE_FILE` != "Disabled" ] && [ -d ~/.mozilla/firefox ]; then
(/usr/sbin/restorecon -vr ~/.mozilla/firefox &)
fi
fi

View File

@ -201,8 +201,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 102.10.0
Release: 1%{?dist}.alma
Version: 102.11.0
Release: 2%{?dist}.alma
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -210,7 +210,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}
@ -232,7 +232,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}-20230404.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20230504.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -1452,9 +1452,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Fri Apr 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.10.0-1.alma
* Thu May 18 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.11.0-2.alma
- Debrand for AlmaLinux
* Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-2
- Update to 102.11.0 build2
* Tue May 02 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
- Update to 102.11.0 build1
* Tue Apr 04 2023 Eike Rathke <erack@redhat.com> - 102.10.0-1
- Update to 102.10.0 build1