From 9d08045a25e2b6b3b715bf182fc2be2a9af8a051 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Fri, 26 Jul 2024 11:13:13 +0800 Subject: [PATCH 1/2] Update to firefox-115.13.0-3 --- README.debrand | 2 - download | 4 +- ...refs.js => firefox-redhat-default-prefs.js | 4 +- firefox.spec | 60 +++++++------------ 4 files changed, 27 insertions(+), 43 deletions(-) delete mode 100644 README.debrand rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (92%) 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/download b/download index f878729..2938599 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ 9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -d55b9df7998ee24d6743d072dc4bac42 firefox-langpacks-115.12.0esr-20240604.tar.xz -9660760a87290448f4c57dd5ae1948f1 firefox-115.12.0esr.processed-source.tar.xz +7052eb7173233eee436a1de890059c22 firefox-langpacks-115.13.0esr-20240708.tar.xz +5d6bbb7bc8c7e65017999c6635b14d21 firefox-115.13.0esr.b3.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 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 3220f75..804f25d 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 @@ -124,7 +122,7 @@ end} # 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 .b3 %bcond_without langpacks @@ -134,8 +132,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.12.0 -Release: 1%{anolis_release}%{?dist} +Version: 115.13.0 +Release: 3%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -155,7 +153,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 @@ -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}-20240604.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20240708.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,8 +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 -- @@ -336,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 @@ -1126,8 +1122,8 @@ echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig # May result in empty --with-libclang-path= in earlier versions. -# So far this is needed only for c8s/c9s. -%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) || (0%{?rhel} == 9 && %{rhel_minor_version} >= 4) +# So far this is needed only for c8s. +%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 # Clang 17 upstream's detection fails, tell it where to look. echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig %endif @@ -1233,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 @@ -1258,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 -* Fri Jun 21 2024 yangxianzhao - 115.12.0-1.0.1 -- rebrand to anolis +* Mon Jul 08 2024 Tomas Popela - 115.13.0-3 +- Update to 115.13.0 build3 + +* Tue Jul 02 2024 Eike Rathke - 115.13.0-2 +- Update to 115.13.0 build2 + +* Mon Jul 01 2024 Eike Rathke - 115.13.0-1 +- Update to 115.13.0 build1 * Tue Jun 04 2024 Eike Rathke - 115.12.0-1 - Update to 115.12.0 build1 -- Gitee From b5efc946289e583fb30a7ec7b2b63845643818e1 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Thu, 25 Jul 2024 18:14:47 +0800 Subject: [PATCH 2/2] rebrand to anolis --- firefox.spec | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/firefox.spec b/firefox.spec index 804f25d..837999f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.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 +67,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 +134,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 115.13.0 -Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -168,7 +169,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20240708.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 +191,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 +335,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 +1232,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 +1257,26 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -mkdir -p .cargo -cat > .cargo/config < .cargo/config < %{_buildrootdir}/cargo/config </dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Jul 25 2024 songmingliang - 115.13.0-3.0.1 +- rebrand to anolis + * Mon Jul 08 2024 Tomas Popela - 115.13.0-3 - Update to 115.13.0 build3 -- Gitee