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/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..ad8eb77ba59be071474988a034571694eaa9db8e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7_9 diff --git a/download b/download index 1bb0c0fc086a6c827e5212829381aceac3d2779c..0ea744d26a2d623e6efb4f59fd5a904ffcb45ae5 100644 --- a/download +++ b/download @@ -1,6 +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 diff --git a/firefox-anolis-default-prefs.js b/firefox-anolis-default-prefs.js index dbe670f5b25c3e42dbf11436f2efb1970e92ce85..be7540d00be20338e4d9fd02268ee1007ead1e96 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-anolis-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", "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.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 dee53946b9c2fc073b92513c491619e161a58dce..6a3f6e4892f2570e315cb9d8c6f4f8932ef9c4c2 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 7300d8e9d4eb13b8bfdb38a6573e4ed5fef1aad9..7f328101a21f77479bd8512f8bc7501789965869 100644 --- a/firefox.spec +++ b/firefox.spec @@ -202,8 +202,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.10.0 -Release: 1%{anolis_release}%{?dist} +Version: 102.11.0 +Release: 2%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -211,7 +211,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 +224,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,7 +233,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}-20230404.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230504.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -266,6 +266,7 @@ 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 Patch25: rhbz-1219542-s390-build.patch @@ -1473,10 +1474,16 @@ 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 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 + +* 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