diff --git a/download b/download index 996f8ffd2405fc82d67d122fce658ed27fe8a03a..81530c8a22ad45ca38b7e38cacf04d5e66c4dd42 100644 --- a/download +++ b/download @@ -4,3 +4,4 @@ d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.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-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 93% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index e1013e55886340b663cf3b4a3ccec435a66f8d5b..4013d8cec7feaab802fd879e5711ccf47002cf1f 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-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", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("startup.homepage_override_url", "https://openanolis.cn"); +pref("startup.homepage_welcome_url", "https://openanolis.cn"); 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 756fc55746f6b6183cdcc3e4c96f85238f8fa5a1..a32b4e0767720c186a570fdd8aeee7eff2e9ce94 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,5 @@ +%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. @@ -122,7 +124,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 @@ -219,7 +221,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.14.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -240,7 +242,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: 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. @@ -254,7 +256,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20230725.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-redhat-default-prefs.js +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -280,6 +282,7 @@ 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 @@ -402,7 +405,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} @@ -455,7 +458,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if !0%{?flatpak} #TODO @@ -937,8 +940,23 @@ which node mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -mkdir -p .cargo -cat > .cargo/config < %{_buildrootdir}/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 #--------------------------------------------------------------------- @@ -1424,7 +1444,9 @@ 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 @@ -1473,6 +1495,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Sep 06 2023 yangxianzhao - 102.14.0-1.0.1 +- rebrand: rebrand to anolis +- fix build error + * Tue Jul 25 2023 Eike Rathke - 102.14.0-1 - Update to 102.14.0 build1