diff --git a/download b/download index 81530c8a22ad45ca38b7e38cacf04d5e66c4dd42..ad019a0fa2351e7a5f3572e25479de5307fd608e 100644 --- a/download +++ b/download @@ -1,7 +1,6 @@ d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.tar.xz -4e9f2a31a2c6d842f87b823cad5e58ea firefox-102.14.0esr.processed-source.tar.xz -53d2a66ed937378faa8142715ae67512 firefox-langpacks-102.14.0esr-20230725.tar.xz +4af123ed7dbad2c8e1f33e8732159ba8 firefox-102.15.0esr.processed-source.tar.xz +c8f1212b0519424712e857cd2d04ca15 firefox-langpacks-102.15.0esr-20230824.tar.xz d41d8cd98f00b204e9800998ecf8427e mochitest-python.tar.gz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm b603172c3f4cbb1d8197328087ca3972 nss-3.79.0-11.el8_1.src.rpm -64e444c5ceddbba10db44d3108809d6c rust-cbindgen.tar.gz diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 93% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 4013d8cec7feaab802fd879e5711ccf47002cf1f..e1013e55886340b663cf3b4a3ccec435a66f8d5b 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-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://openanolis.cn"); -pref("startup.homepage_welcome_url", "https://openanolis.cn"); +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("media.gmp-gmpopenh264.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); diff --git a/firefox.spec b/firefox.spec index be20a940cc23df42e4d28878f5d810c61578e4c9..61a999bd6a3ce2ad6083937b6aa91acc87fe1cac 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 -%global flatpak 1 %global disable_toolsets 0 # Produce a build suitable for release, i.e. use PGO/LTO. You can turn it off # when building locally to reduce build time. @@ -124,7 +122,7 @@ end} %endif %global use_rustts 1 %global dts_version 10 -#%global rust_version 1.62 +%global rust_version 1.62 %if 0%{?rhel} >= 8 %global use_rustts 0 %endif @@ -220,8 +218,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.14.0 -Release: 3%{anolis_release}%{?dist} +Version: 102.15.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -242,7 +240,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use # licenses that are rejected by Red Hat Legal. @@ -251,12 +249,12 @@ ExcludeArch: 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}-20230725.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230824.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -282,7 +280,6 @@ Source45: run-wayland-compositor Source403: nss-3.79.0-11.el8_1.src.rpm Source401: nss-setup-flags-env.inc Source402: nspr-4.34.0-3.el8_1.src.rpm -Source404: rust-cbindgen.tar.gz # Build patches Patch3: mozilla-build-arm.patch @@ -405,7 +402,7 @@ BuildRequires: rustfmt >= %{rust_version} %endif %if 0%{?use_rustts} -#BuildRequires: rust-toolset-%{rust_version} +BuildRequires: rust-toolset-%{rust_version} %endif %if 0%{?use_llvmts} @@ -940,23 +937,8 @@ which node mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -cd .. -mkdir rust-cbindgen -cd rust-cbindgen -%{__tar} xf %{SOURCE404} -mkdir -p %{_buildrootdir}/cargo -export CACHE_DIR=%{_buildrootdir}/cargo -CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR -%ifarch aarch64 -cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR -%endif -%ifarch x86_64 -cp -r rust-cbindgen/rust-cbindgen-x86_64/* $CACHE_DIR -%endif -export PATH=$CACHE_DIR/bin/:$PATH -export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH -rustc --version -cat > %{_buildrootdir}/cargo/config < .cargo/config < 7 ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so -%endif ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so %endif #--------------------------------------------------------------------- @@ -1444,9 +1424,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/pingsender %exclude %{mozappdir}/removed-files %if 0%{?flatpak} -%if 0%{?rhel} > 7 %{_libdir}/libnss3.so -%endif %{_libdir}/libnssckbi.so %endif %{_datadir}/icons/hicolor/16x16/apps/firefox.png @@ -1495,9 +1473,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Aug 18 2023 yangxianzhao - 102.14.0-3.0.1 -- rebrand: rebrand to anolis -- fix build error +* Thu Aug 24 2023 Eike Rathke - 102.15.0-1 +- Update to 102.15.0 build2 * Wed Aug 09 2023 Eike Rathke - 102.14.0-3 - Bump NVR to rebuild