From b8e076ae59a170bc1e7fadb715e76d24965d4f06 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 24 Jul 2023 09:48:46 +0200 Subject: [PATCH] Don't set MOZ_GMP_PATH as it's configured by /etc/profile.d/gmpopenh264.sh from mozilla-openh264 package (rhbz#2221317). --- firefox.sh.in | 11 +++++++---- firefox.spec | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/firefox.sh.in b/firefox.sh.in index 73d0b4e..c72daba 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -129,11 +129,14 @@ FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" export FONTCONFIG_PATH ## -## We want Firefox to use Openh264 provided by Fedora +## We want Firefox to use Openh264 provided by Fedora. +## +## We used to configure it here but It's set by /etc/profile.d/gmpopenh264.sh +## script from mozilla-openh264 package now. Let's keep it here just +## for the record. +## +## export MOZ_GMP_PATH=$MOZ_LIB_DIR/mozilla/plugins/gmp-gmpopenh264/system-installed ## -if [ -z "$MOZ_GMP_PATH" ]; then - export MOZ_GMP_PATH=$MOZ_LIB_DIR/mozilla/plugins/gmp-gmpopenh264/system-installed -fi ## ## In order to better support certain scripts (such as Indic and some CJK diff --git a/firefox.spec b/firefox.spec index 9f54bbf..b11e31a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -160,7 +160,7 @@ ExcludeArch: i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 115.0.2 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -1056,6 +1056,10 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jul 24 2023 Martin Stransky - 115.0.2-4 +- Don't set MOZ_GMP_PATH as it's configured by /etc/profile.d/gmpopenh264.sh + from mozilla-openh264 package. + * Wed Jul 19 2023 Martin Stransky - 115.0.2-3 - Fix the previous fix (rhbz#2221317)