From 5de57df49db61333e19f9dc587c7a9bf01e2b01b Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Thu, 20 Jun 2024 13:23:56 +0800 Subject: [PATCH 1/2] Update to firefox-115.11.0-1.el7_9 --- download | 8 ---- ...refs.js => firefox-redhat-default-prefs.js | 4 +- firefox.spec | 48 +++++++------------ 3 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 download rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (92%) diff --git a/download b/download deleted file mode 100644 index 875c836..0000000 --- a/download +++ /dev/null @@ -1,8 +0,0 @@ -9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -9b817573c3243076706ea91ece79cb9c firefox-langpacks-115.9.1esr-20240322.tar.xz -f8d70e8faa74832cd977276ed62f0da7 firefox-115.9.1esr.processed-source.tar.xz -b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz -7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm -3fdd30cefe44a98c424cb3aeca73f2b3 nss-3.90.0-3.el8_1.src.rpm -5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm -6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 92% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index e24ebbd..cdb98dd 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", "%HOMEPAGE%"); +pref("startup.homepage_welcome_url", "%HOMEPAGE%"); 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 0c3fe19..fc868b3 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 -%global flatpak 1 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -68,7 +66,7 @@ end} %global nspr_version_max 4.36 %global nss_version 3.90 %global nss_version_max 3.91 -#%global rust_version 1.66 +%global rust_version 1.66 %global system_libvpx 0 # Toolsets setup @@ -134,8 +132,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.9.1 -Release: 2%{anolis_release}%{?dist} +Version: 115.11.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,12 +163,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}-20240322.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20240507.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 @@ -192,7 +190,6 @@ Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm Source403: nss-3.90.0-3.el8_1.src.rpm Source404: nss-3.90.0-3.el9_0.src.rpm -Source405: rust-cbindgen.tar.gz # ---- RHEL specific patches --- # -- Downstream only -- @@ -335,7 +332,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_rust_ts} -#BuildRequires: rust-toolset-%{rust_version} +BuildRequires: rust-toolset-%{rust_version} %endif # Bundled nss/nspr requirement @@ -1232,7 +1229,7 @@ source scl_source enable gcc-toolset-12 source scl_source enable devtoolset-%{dts_version} %endif %if 0%{?use_rust_ts} -source scl_source enable rust-toolset +source scl_source enable rust-toolset-%{rust_version} %endif %if 0%{?use_nodejs_scl} source scl_source enable rh-nodejs10 @@ -1257,24 +1254,8 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -cd .. -mkdir rust-cbindgen -cd rust-cbindgen -%{__tar} xf %{SOURCE405} -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 -##rustup default stable -rustc --version -cat > %{_buildrootdir}/cargo/config < .cargo/config </dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Jun 19 2024 yangxianzhao - 115.9.1-2.0.1 -- rebrand to anolis +* Tue May 07 2024 Eike Rathke - 115.11.0-1 +- Update to 115.11.0 build1 + +* Tue Apr 09 2024 Eike Rathke - 115.10.0-1 +- Update to 115.10.0 build1 * Tue Apr 09 2024 Jan Horak - 115.9.1-2 - Removed expat CVE fix -- Gitee From 33453a70c5a5ce2e4e8a377a1ef36ab1ff3ae608 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Thu, 20 Jun 2024 13:24:38 +0800 Subject: [PATCH 2/2] rebrand to anolis --- download | 8 ++++ ...refs.js => firefox-anolis-default-prefs.js | 4 +- firefox.spec | 41 +++++++++++++++---- 3 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 download rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (92%) diff --git a/download b/download new file mode 100644 index 0000000..2e2bd72 --- /dev/null +++ b/download @@ -0,0 +1,8 @@ +9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz +26393f4ca40dee167dea9e83516ac8cd firefox-115.11.0esr.processed-source.tar.xz +5479fb1ebefdb55e9c7b6fc6805091c1 firefox-langpacks-115.11.0esr-20240507.tar.xz +b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz +7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm +3fdd30cefe44a98c424cb3aeca73f2b3 nss-3.90.0-3.el8_1.src.rpm +5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm +6611e41665de11dd80b2ff5f1f40ee03 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 cdb98dd..e24ebbd 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", "%HOMEPAGE%"); -pref("startup.homepage_welcome_url", "%HOMEPAGE%"); +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 fc868b3..f03ff25 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,5 @@ +%define anolis_release .0.1 +%global flatpak 1 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -66,7 +68,7 @@ end} %global nspr_version_max 4.36 %global nss_version 3.90 %global nss_version_max 3.91 -%global rust_version 1.66 +#%global rust_version 1.66 %global system_libvpx 0 # Toolsets setup @@ -133,7 +135,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 115.11.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -168,7 +170,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20240507.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 @@ -190,6 +192,8 @@ Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm Source403: nss-3.90.0-3.el8_1.src.rpm Source404: nss-3.90.0-3.el9_0.src.rpm +Source405: rust-cbindgen.tar.gz + # ---- RHEL specific patches --- # -- Downstream only -- @@ -332,7 +336,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_rust_ts} -BuildRequires: rust-toolset-%{rust_version} +#BuildRequires: rust-toolset-%{rust_version} %endif # Bundled nss/nspr requirement @@ -1229,7 +1233,7 @@ source scl_source enable gcc-toolset-12 source scl_source enable devtoolset-%{dts_version} %endif %if 0%{?use_rust_ts} -source scl_source enable rust-toolset-%{rust_version} +source scl_source enable rust-toolset %endif %if 0%{?use_nodejs_scl} source scl_source enable rh-nodejs10 @@ -1254,8 +1258,24 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -mkdir -p .cargo -cat > .cargo/config < %{_buildrootdir}/cargo/config </dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Jun 20 2024 yangxianzhao - 115.11.0-1.0.1 +- rebrand to anolis + * Tue May 07 2024 Eike Rathke - 115.11.0-1 - Update to 115.11.0 build1 -- Gitee