diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d23331458e1bab1b7a742558bec236e3612..0000000000000000000000000000000000000000 --- 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 f8787294dff43ad9d8669fe806ed243cf8edc725..29385998cbc2580edce2287096cf46ce61b987dc 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 e24ebbd2f3b9d2804dee6d0bab56b918c5bc4ad3..cdb98dd64736c86cf93baa3c8ff56c9c77371441 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 3220f7529d5f53bf153a4607f1b132a2d0c90f90..837999f406374a7c6d0cdd33f4f3667d7a6ab3bc 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,4 @@ %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 @@ -124,7 +123,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 +133,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.12.0 -Release: 1%{anolis_release}%{?dist} +Version: 115.13.0 +Release: 3%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -155,7 +154,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,7 +164,7 @@ 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 @@ -1126,8 +1125,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 @@ -1264,7 +1263,7 @@ cd rust-cbindgen %{__tar} xf %{SOURCE405} mkdir -p %{_buildrootdir}/cargo export CACHE_DIR=%{_buildrootdir}/cargo -CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR +CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR %ifarch aarch64 cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR %endif @@ -1275,6 +1274,8 @@ export PATH=$CACHE_DIR/bin/:$PATH export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH ##rustup default stable rustc --version +#mkdir -p .cargo +#cat > .cargo/config < %{_buildrootdir}/cargo/config </dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Jun 21 2024 yangxianzhao - 115.12.0-1.0.1 +* 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 + +* 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