diff --git a/.firefox.metadata b/.firefox.metadata index e3c96ff2e77cccba675e9f98492b1523c343b4dc..8f7976192b6236fef3d0364e966fef6e842d65a0 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz -6a1e5c6a7c4497b0bf544e24ba78bf759d4da9e2 SOURCES/firefox-91.11.0esr.processed-source.tar.xz -6bca3b3adb356220f4b492eba13eb1f6962b236a SOURCES/firefox-langpacks-91.11.0esr-20220623.tar.xz +39f2ee46c5e34141352021b76f4f41f75d6ad6b7 SOURCES/firefox-91.12.0esr.processed-source.tar.xz +7f84818bb27b90dce6b858f2acbf64c4e35e29f3 SOURCES/firefox-langpacks-91.12.0esr-20220721.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch new file mode 100644 index 0000000000000000000000000000000000000000..6dfe2ada2bcab17ecf2caf305034f76b6e4b6a96 --- /dev/null +++ b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch @@ -0,0 +1,12 @@ +diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h +--- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200 ++++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200 +@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo + void* aContext) { + asm volatile("nop; nop; nop; nop" : : : "memory"); + +- asm volatile("b %0" : : "X"(H) : "memory"); ++ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory"); + } + + # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch new file mode 100644 index 0000000000000000000000000000000000000000..3f84f9522a28d2e40b3f23266d90f4f495347c02 --- /dev/null +++ b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch @@ -0,0 +1,35 @@ +From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Sat, 1 Jun 2019 09:06:01 +0900 +Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and + user_vfp_exc. + +--- + js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp +index 636537f8478..383c380f04c 100644 +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp +@@ -248,7 +248,16 @@ using mozilla::DebugOnly; + #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS +-# include ++struct user_vfp { ++ unsigned long long fpregs[32]; ++ unsigned long fpscr; ++}; ++ ++struct user_vfp_exc { ++ unsigned long fpexc; ++ unsigned long fpinst; ++ unsigned long fpinst2; ++}; + #endif + + #if defined(ANDROID) +-- +2.20.1 + diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 3c2cda3ecded62b54fad72098f8c5934ade42283..8bf461e9ea443a698caa6cf73d5d862a65bc4921 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,4 +1,9 @@ [Global] -id=circle-linux +id=redhat version=1.0 -about=Mozilla Firefox for Circle Linux +about=Mozilla Firefox for Red Hat Enterprise Linux + +[Preferences] +app.distributor=redhat +app.distributor.channel=redhat +app.partner.fedora=redhat diff --git a/SOURCES/firefox-circle-default-prefs.js b/SOURCES/firefox-opencloudos-default-prefs.js similarity index 92% rename from SOURCES/firefox-circle-default-prefs.js rename to SOURCES/firefox-opencloudos-default-prefs.js index e1347d7035503ed44ae2be3712649291bc713137..7b0e2d944e3baae4ebf762b4a6a73408fe08d28d 100644 --- a/SOURCES/firefox-circle-default-prefs.js +++ b/SOURCES/firefox-opencloudos-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://cclinux.org"); -pref("startup.homepage_welcome_url", "https://cclinux.org"); +pref("startup.homepage_override_url", "https://www.opencloudos.org"); +pref("startup.homepage_welcome_url", "https://www.opencloudos.org"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000000000000000000000000000000000000..9ead3a2085db1bcf5515db5f25c4db81fc6ba7a6 --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,35 @@ +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +pref("general.smoothScroll", true); +pref("intl.locale.matchOS", true); +pref("toolkit.storage.synchronous", 0); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); +pref("browser.backspace_action", 2); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.shell.checkDefaultBrowser", false); +pref("network.manage-offline-status", true); +pref("extensions.shownSelectionUI", true); +pref("ui.SpellCheckerUnderlineStyle", 1); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); +pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); +pref("media.gmp-gmpopenh264.provider.enabled",false); +pref("media.gmp-gmpopenh264.autoupdate",false); +pref("media.gmp-gmpopenh264.enabled",false); +pref("media.gmp-gmpopenh264.enabled",false); +pref("plugins.notifyMissingFlash", false); +/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */ +pref("browser.display.use_system_colors", false); +pref("layers.use-image-offscreen-surfaces", false); +/* Allow sending credetials to all https:// sites */ +pref("network.negotiate-auth.trusted-uris", "https://"); +pref("security.use_sqldb", false); +/* Use OS settings for UI language */ +pref("intl.locale.requested", ""); +/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/SOURCES/mozilla-api-key b/SOURCES/mozilla-api-key index a19633c0fdf5c71a4058112b613453d9c28e43a2..81877bc006dbe9ef8295fa06cfa16a9d39723cbf 100644 --- a/SOURCES/mozilla-api-key +++ b/SOURCES/mozilla-api-key @@ -1 +1 @@ -bf667dff-8eda-4437-9ae5-bb8f66c2fa96 +9008bb7e-1e22-4038-94fe-047dd48ccc0b diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index f14e8bfc5f9ecf34bfbea73f1474fe6d1f0c9897..e44f5de00287d7898abc0d3e591ceb763ef02058 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -133,24 +133,24 @@ end} #global buildnum %{?does_not_exist} %global buildnum %{?does_not_exist} -Summary: Mozilla Firefox Web browser -Name: firefox -Version: 91.11.0 -Release: 2%{?dist} -URL: https://www.mozilla.org/firefox/ -License: MPLv1.1 or GPLv2+ or LGPLv2+ +Summary: Mozilla Firefox Web browser +Name: firefox +Version: 91.12.0 +Release: 2%{?dist}.1 +URL: https://www.mozilla.org/firefox/ +License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 -ExcludeArch: %{ix86} +ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 %if %{rhel_minor_version} == 1 -ExcludeArch: %{ix86} aarch64 s390x +ExcludeArch: %{ix86} aarch64 s390x %else -ExcludeArch: %{ix86} +ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -158,149 +158,149 @@ ExcludeArch: aarch64 s390 ppc # The official tarball has to be always processed by the process-official-tarball # script. # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/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 %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220623.tar.xz - -%endif -Source2: cbindgen-vendor.tar.xz -Source3: process-official-tarball -Source10: firefox-mozconfig -%if 0%{?circle} -Source12: firefox-circle-default-prefs.js -%else -Source12: firefox-circle-default-prefs.js -%endif -Source20: firefox.desktop -Source21: firefox.sh.in -Source23: firefox.1 -Source24: mozilla-api-key -Source25: firefox-symbolic.svg -Source26: distribution.ini -Source27: google-api-key -Source28: node-stdout-nonblocking-wrapper - -Source403: nss-3.67.0-7.el8_1.src.rpm -Source401: nss-setup-flags-env.inc -Source402: nspr-4.32.0-1.el8_1.src.rpm +Source1: firefox-langpacks-%{version}%{?pre_version}-20220721.tar.xz + +%endif +Source2: cbindgen-vendor.tar.xz +Source3: process-official-tarball +Source10: firefox-mozconfig +Source12: firefox-opencloudos-default-prefs.js +Source20: firefox.desktop +Source21: firefox.sh.in +Source23: firefox.1 +Source24: mozilla-api-key +Source25: firefox-symbolic.svg +Source26: distribution.ini +Source27: google-api-key +Source28: node-stdout-nonblocking-wrapper + +Source403: nss-3.67.0-7.el8_1.src.rpm +Source401: nss-setup-flags-env.inc +Source402: nspr-4.32.0-1.el8_1.src.rpm # Build patches -Patch1001: build-ppc64le-inline.patch -Patch1008: build-rhel7-nasm-dwarf.patch -Patch1009: build-debuginfo-fix.patch +Patch1001: build-ppc64le-inline.patch +Patch1008: build-rhel7-nasm-dwarf.patch +Patch1009: build-debuginfo-fix.patch # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 -Patch4: build-mozconfig-fix.patch -Patch6: build-nss-version.patch +Patch4: build-mozconfig-fix.patch +Patch6: build-nss-version.patch # Fedora/RHEL specific patches -Patch215: firefox-enable-addons.patch -Patch219: rhbz-1173156.patch -Patch224: mozilla-1170092.patch -Patch225: firefox-nss-addon-hack.patch +Patch215: firefox-enable-addons.patch +Patch219: rhbz-1173156.patch +Patch224: mozilla-1170092.patch +Patch225: firefox-nss-addon-hack.patch # Upstream patches -Patch503: mozilla-s390-context.patch -Patch505: mozilla-bmo1005535.patch -Patch506: mozilla-bmo1504834-part1.patch -Patch507: mozilla-bmo1504834-part2.patch -Patch508: mozilla-bmo1504834-part3.patch -Patch509: mozilla-bmo1504834-part4.patch -Patch510: mozilla-bmo1554971.patch -Patch511: mozilla-bmo1602730.patch -Patch512: mozilla-bmo849632.patch -Patch513: mozilla-bmo998749.patch +Patch503: mozilla-s390-context.patch +Patch505: mozilla-bmo1005535.patch +Patch506: mozilla-bmo1504834-part1.patch +Patch507: mozilla-bmo1504834-part2.patch +Patch508: mozilla-bmo1504834-part3.patch +Patch509: mozilla-bmo1504834-part4.patch +Patch510: mozilla-bmo1554971.patch +Patch511: mozilla-bmo1602730.patch +Patch512: mozilla-bmo849632.patch +Patch513: mozilla-bmo998749.patch #Patch514: mozilla-s390x-skia-gradient.patch -Patch515: mozilla-bmo1626236.patch -Patch518: D110204-fscreen.diff -Patch519: expat-CVE-2022-25235.patch -Patch520: expat-CVE-2022-25236.patch -Patch521: expat-CVE-2022-25315.patch +Patch515: mozilla-bmo1626236.patch +Patch518: D110204-fscreen.diff +Patch519: expat-CVE-2022-25235.patch +Patch520: expat-CVE-2022-25236.patch +Patch521: expat-CVE-2022-25315.patch # Flatpak patches +# CentOS patches +Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +Patch10001: Bug-1526653---fix_user_vfp_armv7.patch + %if %{?system_nss} %if !0%{?bundle_nss} -BuildRequires: pkgconfig(nspr) >= %{nspr_version} -BuildRequires: pkgconfig(nss) >= %{nss_version} -BuildRequires: nss-static >= %{nss_version} -%endif -%endif -BuildRequires: pkgconfig(libpng) -BuildRequires: xz -BuildRequires: libXt-devel -BuildRequires: mesa-libGL-devel -Requires: liberation-fonts-common -Requires: liberation-sans-fonts -BuildRequires: libjpeg-devel -BuildRequires: zip -BuildRequires: bzip2-devel -BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(nspr) >= %{nspr_version} +BuildRequires: pkgconfig(nss) >= %{nss_version} +BuildRequires: nss-static >= %{nss_version} +%endif +%endif +BuildRequires: pkgconfig(libpng) +BuildRequires: xz +BuildRequires: libXt-devel +BuildRequires: mesa-libGL-devel +Requires: liberation-fonts-common +Requires: liberation-sans-fonts +BuildRequires: libjpeg-devel +BuildRequires: zip +BuildRequires: bzip2-devel +BuildRequires: pkgconfig(zlib) #BuildRequires: pkgconfig(libIDL-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: krb5-devel -BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(freetype2) >= 2.1.9 -BuildRequires: pkgconfig(xt) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(dri) -BuildRequires: pkgconfig(libcurl) -BuildRequires: dbus-glib-devel -BuildRequires: m4 - -BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: krb5-devel +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(freetype2) >= 2.1.9 +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(libstartup-notification-1.0) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(dri) +BuildRequires: pkgconfig(libcurl) +BuildRequires: dbus-glib-devel +BuildRequires: m4 + +BuildRequires: pkgconfig(libpulse) %if 0%{?use_dts} -BuildRequires: devtoolset-%{dts_version}-gcc-c++ -BuildRequires: devtoolset-%{dts_version}-gcc -BuildRequires: devtoolset-%{dts_version}-libatomic-devel +BuildRequires: devtoolset-%{dts_version}-gcc-c++ +BuildRequires: devtoolset-%{dts_version}-gcc +BuildRequires: devtoolset-%{dts_version}-libatomic-devel %endif %if 0%{?rhel} == 9 -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cargo -BuildRequires: rust -BuildRequires: clang clang-libs llvm +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cargo +BuildRequires: rust +BuildRequires: clang clang-libs llvm %endif -BuildRequires: scl-utils -BuildRequires: findutils +BuildRequires: scl-utils +BuildRequires: findutils -BuildRequires: %{nodejs_rb} >= 10.21 -BuildRequires: python3 +BuildRequires: %{nodejs_rb} >= 10.21 +BuildRequires: python3 %if 0%{?rhel} == 8 -BuildRequires: cargo -BuildRequires: rust >= %{rust_version} -BuildRequires: llvm >= %{llvm_version} -BuildRequires: llvm-devel >= %{llvm_version} -BuildRequires: clang >= %{llvm_version} -BuildRequires: clang-devel >= %{llvm_version} -BuildRequires: rustfmt >= %{rust_version} +BuildRequires: cargo +BuildRequires: rust >= %{rust_version} +BuildRequires: llvm >= %{llvm_version} +BuildRequires: llvm-devel >= %{llvm_version} +BuildRequires: clang >= %{llvm_version} +BuildRequires: clang-devel >= %{llvm_version} +BuildRequires: rustfmt >= %{rust_version} %else %if 0%{?use_rustts} -BuildRequires: rust-toolset-%{rust_version} +BuildRequires: rust-toolset-%{rust_version} %endif %if 0%{?use_llvmts} -BuildRequires: llvm-toolset-%{llvm_version} -BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel -BuildRequires: llvm-toolset-%{llvm_version}-clang -BuildRequires: llvm-toolset-%{llvm_version}-clang-devel +BuildRequires: llvm-toolset-%{llvm_version} +BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel +BuildRequires: llvm-toolset-%{llvm_version}-clang +BuildRequires: llvm-toolset-%{llvm_version}-clang-devel %endif %endif -BuildRequires: nasm +BuildRequires: nasm %if %{build_with_clang} -BuildRequires: lld +BuildRequires: lld %endif %if 0%{?rhel} == 8 %if %{rhel_minor_version} >= 3 -BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(libpipewire-0.3) %else -BuildRequires: pipewire-devel +BuildRequires: pipewire-devel %endif %endif @@ -310,97 +310,97 @@ BuildRequires: perl-interpreter # Bundled nss/nspr requirement %if 0%{?bundle_nss} -BuildRequires: nss-softokn -BuildRequires: sqlite-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig -BuildRequires: gawk -BuildRequires: psmisc -BuildRequires: perl-interpreter -BuildRequires: gcc-c++ -BuildRequires: xmlto +BuildRequires: nss-softokn +BuildRequires: sqlite-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: gawk +BuildRequires: psmisc +BuildRequires: perl-interpreter +BuildRequires: gcc-c++ +BuildRequires: xmlto %endif -BuildRequires: libstdc++-static +BuildRequires: libstdc++-static -Requires: mozilla-filesystem -Requires: p11-kit-trust +Requires: mozilla-filesystem +Requires: p11-kit-trust %if %{?system_nss} %if !0%{?bundle_nss} -Requires: nspr >= %{nspr_build_version} -Requires: nss >= %{nss_build_version} +Requires: nspr >= %{nspr_build_version} +Requires: nss >= %{nss_build_version} %endif %endif -BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks -Requires: redhat-indexhtml +BuildRequires: desktop-file-utils +BuildRequires: system-bookmarks +Requires: redhat-indexhtml %if %{?run_tests} -BuildRequires: xorg-x11-server-Xvfb +BuildRequires: xorg-x11-server-Xvfb %endif -BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(libffi) %if 0%{?big_endian} %if 0%{?flatpak} -BuildRequires: icu +BuildRequires: icu %endif %endif -Obsoletes: mozilla <= 37:1.7.13 -Provides: webclient +Obsoletes: mozilla <= 37:1.7.13 +Provides: webclient # Bundled libraries -Provides: bundled(angle) -Provides: bundled(cairo) -Provides: bundled(graphite2) -Provides: bundled(harfbuzz) -Provides: bundled(ots) -Provides: bundled(sfntly) -Provides: bundled(skia) -Provides: bundled(thebes) -Provides: bundled(WebRender) -Provides: bundled(audioipc-2) -Provides: bundled(ffvpx) -Provides: bundled(kissfft) -Provides: bundled(libaom) -Provides: bundled(libcubeb) -Provides: bundled(libdav1d) -Provides: bundled(libjpeg) -Provides: bundled(libmkv) -Provides: bundled(libnestegg) -Provides: bundled(libogg) -Provides: bundled(libopus) -Provides: bundled(libpng) -Provides: bundled(libsoundtouch) -Provides: bundled(libspeex_resampler) -Provides: bundled(libtheora) -Provides: bundled(libtremor) -Provides: bundled(libvorbis) -Provides: bundled(libvpx) -Provides: bundled(libwebp) -Provides: bundled(libyuv) -Provides: bundled(mp4parse-rust) -Provides: bundled(mtransport) -Provides: bundled(openmax_dl) -Provides: bundled(double-conversion) -Provides: bundled(brotli) -Provides: bundled(fdlibm) -Provides: bundled(freetype2) -Provides: bundled(libmar) -Provides: bundled(woff2) -Provides: bundled(xz-embedded) -Provides: bundled(zlib) -Provides: bundled(expat) -Provides: bundled(msgpack-c) -Provides: bundled(libprio) -Provides: bundled(rlbox_sandboxing_api) -Provides: bundled(sqlite3) +Provides: bundled(angle) +Provides: bundled(cairo) +Provides: bundled(graphite2) +Provides: bundled(harfbuzz) +Provides: bundled(ots) +Provides: bundled(sfntly) +Provides: bundled(skia) +Provides: bundled(thebes) +Provides: bundled(WebRender) +Provides: bundled(audioipc-2) +Provides: bundled(ffvpx) +Provides: bundled(kissfft) +Provides: bundled(libaom) +Provides: bundled(libcubeb) +Provides: bundled(libdav1d) +Provides: bundled(libjpeg) +Provides: bundled(libmkv) +Provides: bundled(libnestegg) +Provides: bundled(libogg) +Provides: bundled(libopus) +Provides: bundled(libpng) +Provides: bundled(libsoundtouch) +Provides: bundled(libspeex_resampler) +Provides: bundled(libtheora) +Provides: bundled(libtremor) +Provides: bundled(libvorbis) +Provides: bundled(libvpx) +Provides: bundled(libwebp) +Provides: bundled(libyuv) +Provides: bundled(mp4parse-rust) +Provides: bundled(mtransport) +Provides: bundled(openmax_dl) +Provides: bundled(double-conversion) +Provides: bundled(brotli) +Provides: bundled(fdlibm) +Provides: bundled(freetype2) +Provides: bundled(libmar) +Provides: bundled(woff2) +Provides: bundled(xz-embedded) +Provides: bundled(zlib) +Provides: bundled(expat) +Provides: bundled(msgpack-c) +Provides: bundled(libprio) +Provides: bundled(rlbox_sandboxing_api) +Provides: bundled(sqlite3) %if 0%{?bundle_nss} -Provides: bundled(nss) = 3.67.0 -Provides: bundled(nspr) = 4.32.0 +Provides: bundled(nss) = 3.67.0 +Provides: bundled(nspr) = 4.32.0 %endif %description @@ -410,7 +410,7 @@ compliance, performance and portability. %if %{run_tests} %global testsuite_pkg_name mozilla-%{name}-testresults %package -n %{testsuite_pkg_name} -Summary: Results of testsuite +Summary: Results of testsuite %description -n %{testsuite_pkg_name} This package contains results of tests executed during build. %files -n %{testsuite_pkg_name} @@ -478,6 +478,11 @@ echo "use_rustts %{?use_rustts}" %endif %endif +%ifarch %{arm} +%patch 10000 -p1 -b .centos.armhfp +%patch 10001 -p1 -b .centos.armhfp2 +%endif + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} @@ -1040,8 +1045,8 @@ cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml < firefox.desktop @@ -1162,9 +1167,7 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries %{__mkdir_p} %{buildroot}%{mozappdir}/distribution %{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution -%if 0%{?circle} -sed -i -e 's|Red Hat Enterprise|Circle|' %{buildroot}%{mozappdir}/distribution/distribution.ini -%endif +sed -i -e 's|Red Hat Enterprise|CentOS|' %{buildroot}%{mozappdir}/distribution/distribution.ini # Remove copied libraries to speed up build rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so @@ -1271,8 +1274,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Jul 01 2022 earthloong - 91.11.0-2 -- Add Circle Linux default preferences and debranding patches +* Fri Aug 12 2022 Fanjun Kong - 91.12.0-2.oc8.1 +- Update to 91.12.0 build2 for oc8 + +* Mon Aug 01 2022 CentOS Sources - 91.12.0-2.el8.centos +- Apply debranding changes + +* Thu Jul 21 2022 Eike Rathke - 91.12.0-1 +- Update to 91.12.0 build1 * Thu Jun 23 2022 Eike Rathke - 91.11.0-2 - Update to 91.11.0 build2