From f19a6a615e4310e4efb8d1b66f5b6ddbdf694405 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 18 May 2023 09:55:16 +0800 Subject: [PATCH 1/2] update to firefox-102.11.0-2.el7_9 Signed-off-by: anolis-bot --- README.debrand | 2 - dist | 1 + download | 5 +- ...refs.js => firefox-redhat-default-prefs.js | 7 +-- firefox.sh.in | 4 +- firefox.spec | 58 ++++++------------- 6 files changed, 27 insertions(+), 50 deletions(-) delete mode 100644 README.debrand create mode 100644 dist rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (88%) diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/dist b/dist new file mode 100644 index 0000000..ad8eb77 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7_9 diff --git a/download b/download index 1bb0c0f..efec3c0 100644 --- a/download +++ b/download @@ -1,7 +1,6 @@ d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.tar.xz -920887f6c1eb2a7b3f0fac091cf5804d firefox-langpacks-102.10.0esr-20230404.tar.xz -37f14da38b1f146ba29396b525cfcae3 firefox-102.10.0esr.processed-source.tar.xz +43f7514b1ffa8faf3521d8376ed6205f firefox-102.11.0esr.b2.processed-source.tar.xz +2ade4849d4f797efbaf87f8a0b2a4926 firefox-langpacks-102.11.0esr-20230504.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 88% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index dbe670f..9f6c0f1 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,11 +14,10 @@ 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.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); diff --git a/firefox.sh.in b/firefox.sh.in index dee5394..6a3f6e4 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -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 diff --git a/firefox.spec b/firefox.spec index 7300d8e..42882ee 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. @@ -106,7 +104,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 @@ -202,8 +200,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.10.0 -Release: 1%{anolis_release}%{?dist} +Version: 102.11.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -211,7 +209,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} @@ -224,7 +222,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. @@ -233,12 +231,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}-20230404.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230504.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 @@ -264,7 +262,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 @@ -386,7 +383,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} @@ -439,7 +436,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if !0%{?flatpak} #TODO @@ -918,23 +915,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 #--------------------------------------------------------------------- @@ -1422,9 +1402,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 @@ -1473,10 +1451,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Apr 17 2023 yangxianzhao - 102.10.0-1.0.1 -- rebrand: rebrand for anolis -- feat: fix an7 compile problem - +* Thu May 04 2023 Eike Rathke - 102.11.0-2 +- Update to 102.11.0 build2 + +* Tue May 02 2023 Eike Rathke - 102.11.0-1 +- Update to 102.11.0 build1 + * Tue Apr 04 2023 Eike Rathke - 102.10.0-1 - Update to 102.10.0 build1 -- Gitee From 3a160079e3eaa8bca9239102b7b0466a763cb2e4 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Thu, 18 May 2023 10:23:29 +0800 Subject: [PATCH 2/2] rebrand and fix build error --- download | 1 + ...refs.js => firefox-anolis-default-prefs.js | 4 +- firefox.spec | 45 +++++++++++++++---- 3 files changed, 39 insertions(+), 11 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (92%) diff --git a/download b/download index efec3c0..0ea744d 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 92% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 9f6c0f1..be7540d 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 42882ee..7f32810 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. @@ -104,7 +106,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 @@ -201,7 +203,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.11.0 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -236,7 +238,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20230504.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 @@ -262,6 +264,8 @@ 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 @@ -383,7 +387,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} @@ -436,7 +440,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if !0%{?flatpak} #TODO @@ -915,8 +919,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 #--------------------------------------------------------------------- @@ -1402,7 +1423,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 @@ -1451,6 +1474,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu May 18 2023 yangxianzhao - 102.11.0-2.0.1 +- rebrand: rebrand to anolis +- fix build error + * Thu May 04 2023 Eike Rathke - 102.11.0-2 - Update to 102.11.0 build2 -- Gitee