From d6f8e2b5a61ef2540d058bc598f60ad6cb6ea93a Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Wed, 15 Feb 2023 14:30:57 +0800 Subject: [PATCH 1/2] Update to firefox-102.7.0-1.el7_9 --- download | 5 +- ...refs.js => firefox-redhat-default-prefs.js | 6 +- firefox-x11.desktop | 235 ++++++++++++++++++ firefox-x11.sh.in | 7 + firefox.spec | 72 +++--- 5 files changed, 283 insertions(+), 42 deletions(-) rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (91%) create mode 100644 firefox-x11.desktop create mode 100644 firefox-x11.sh.in diff --git a/download b/download index 078fc85..71b8b75 100644 --- a/download +++ b/download @@ -1,7 +1,6 @@ d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.tar.xz -5f473550e9395f1af6216211ee7b28ba firefox-102.6.0esr.processed-source.tar.xz -5b4b32c4f5d60b7993b0b832d76a0a75 firefox-langpacks-102.6.0esr-20221206.tar.xz +28dbd9a657d9e9cd36e0ad28de246300 firefox-102.7.0esr.processed-source.tar.xz +8a3dabdf79f3117c11fefffcd8a7ab8b firefox-langpacks-102.7.0esr-20230110.tar.xz d41d8cd98f00b204e9800998ecf8427e mochitest-python.tar.gz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm 04f69b8baa7bd8ddc49d786b04307df8 nss-3.79.0-6.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 91% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 8d3354e..7bf5098 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", "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); @@ -36,4 +36,4 @@ pref("browser.gnome-search-provider.enabled",true); /* Enable ffvpx playback for WebRTC */ pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/firefox-x11.desktop b/firefox-x11.desktop new file mode 100644 index 0000000..4124891 --- /dev/null +++ b/firefox-x11.desktop @@ -0,0 +1,235 @@ +[Desktop Entry] +Version=1.0 +Name=Firefox on X11 +GenericName=Web Browser +Comment=Browse the Web +Exec=firefox-x11 --name firefox-x11 %u +Icon=firefox +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; +Keywords=web;browser;internet; +Actions=new-window;new-private-window;profile-manager-window; + +[Desktop Action new-window] +Name=Open a New Window +Name[ach]=Dirica manyen +Name[af]=Nuwe venster +Name[an]=Nueva finestra +Name[ar]=نافذة جديدة +Name[as]=নতুন উইন্ডো +Name[ast]=Ventana nueva +Name[az]=Yeni Pəncərə +Name[be]=Новае акно +Name[bg]=Нов прозорец +Name[bn_BD]=নতুন উইন্ডো (N) +Name[bn_IN]=নতুন উইন্ডো +Name[br]=Prenestr nevez +Name[brx]=गोदान उइन्ड'(N) +Name[bs]=Novi prozor +Name[ca]=Finestra nova +Name[cak]=K'ak'a' tzuwäch +Name[cs]=Nové okno +Name[cy]=Ffenestr Newydd +Name[da]=Nyt vindue +Name[de]=Neues Fenster +Name[dsb]=Nowe wokno +Name[el]=Νέο παράθυρο +Name[en_GB]=New Window +Name[en_US]=New Window +Name[en_ZA]=New Window +Name[eo]=Nova fenestro +Name[es_AR]=Nueva ventana +Name[es_CL]=Nueva ventana +Name[es_ES]=Nueva ventana +Name[es_MX]=Nueva ventana +Name[et]=Uus aken +Name[eu]=Leiho berria +Name[fa]=پنجره جدید‌ +Name[ff]=Henorde Hesere +Name[fi]=Uusi ikkuna +Name[fr]=Nouvelle fenêtre +Name[fy_NL]=Nij finster +Name[ga_IE]=Fuinneog Nua +Name[gd]=Uinneag ùr +Name[gl]=Nova xanela +Name[gn]=Ovetã pyahu +Name[gu_IN]=નવી વિન્ડો +Name[he]=חלון חדש +Name[hi_IN]=नया विंडो +Name[hr]=Novi prozor +Name[hsb]=Nowe wokno +Name[hu]=Új ablak +Name[hy_AM]=Նոր Պատուհան +Name[id]=Jendela Baru +Name[is]=Nýr gluggi +Name[it]=Nuova finestra +Name[ja]=新しいウィンドウ +Name[ja_JP-mac]=新規ウインドウ +Name[ka]=ახალი ფანჯარა +Name[kk]=Жаңа терезе +Name[km]=បង្អួច​​​ថ្មី +Name[kn]=ಹೊಸ ಕಿಟಕಿ +Name[ko]=새 창 +Name[kok]=नवें जनेल +Name[ks]=نئئ وِنڈو +Name[lij]=Neuvo barcon +Name[lo]=ຫນ້າຕ່າງໃຫມ່ +Name[lt]=Naujas langas +Name[ltg]=Jauns lūgs +Name[lv]=Jauns logs +Name[mai]=नव विंडो +Name[mk]=Нов прозорец +Name[ml]=പുതിയ ജാലകം +Name[mr]=नवीन पटल +Name[ms]=Tetingkap Baru +Name[my]=ဝင်းဒိုးအသစ် +Name[nb_NO]=Nytt vindu +Name[ne_NP]=नयाँ सञ्झ्याल +Name[nl]=Nieuw venster +Name[nn_NO]=Nytt vindauge +Name[or]=ନୂତନ ୱିଣ୍ଡୋ +Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ +Name[pl]=Nowe okno +Name[pt_BR]=Nova janela +Name[pt_PT]=Nova janela +Name[rm]=Nova fanestra +Name[ro]=Fereastră nouă +Name[ru]=Новое окно +Name[sat]=नावा विंडो (N) +Name[si]=නව කවුළුවක් +Name[sk]=Nové okno +Name[sl]=Novo okno +Name[son]=Zanfun taaga +Name[sq]=Dritare e Re +Name[sr]=Нови прозор +Name[sv_SE]=Nytt fönster +Name[ta]=புதிய சாளரம் +Name[te]=కొత్త విండో +Name[th]=หน้าต่างใหม่ +Name[tr]=Yeni pencere +Name[tsz]=Eraatarakua jimpani +Name[uk]=Нове вікно +Name[ur]=نیا دریچہ +Name[uz]=Yangi oyna +Name[vi]=Cửa sổ mới +Name[wo]=Palanteer bu bees +Name[xh]=Ifestile entsha +Name[zh_CN]=新建窗口 +Name[zh_TW]=開新視窗 +Exec=firefox-x11 --name firefox-x11 --new-window %u + +[Desktop Action new-private-window] +Name=Open a New Private Window +Name[ach]=Dirica manyen me mung +Name[af]=Nuwe privaatvenster +Name[an]=Nueva finestra privada +Name[ar]=نافذة خاصة جديدة +Name[as]=নতুন ব্যক্তিগত উইন্ডো +Name[ast]=Ventana privada nueva +Name[az]=Yeni Məxfi Pəncərə +Name[be]=Новае акно адасаблення +Name[bg]=Нов прозорец за поверително сърфиране +Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো +Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো +Name[br]=Prenestr merdeiñ prevez nevez +Name[brx]=गोदान प्राइभेट उइन्ड' +Name[bs]=Novi privatni prozor +Name[ca]=Finestra privada nova +Name[cak]=K'ak'a' ichinan tzuwäch +Name[cs]=Nové anonymní okno +Name[cy]=Ffenestr Breifat Newydd +Name[da]=Nyt privat vindue +Name[de]=Neues privates Fenster +Name[dsb]=Nowe priwatne wokno +Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης +Name[en_GB]=New Private Window +Name[en_US]=New Private Window +Name[en_ZA]=New Private Window +Name[eo]=Nova privata fenestro +Name[es_AR]=Nueva ventana privada +Name[es_CL]=Nueva ventana privada +Name[es_ES]=Nueva ventana privada +Name[es_MX]=Nueva ventana privada +Name[et]=Uus privaatne aken +Name[eu]=Leiho pribatu berria +Name[fa]=پنجره ناشناس جدید +Name[ff]=Henorde Suturo Hesere +Name[fi]=Uusi yksityinen ikkuna +Name[fr]=Nouvelle fenêtre de navigation privée +Name[fy_NL]=Nij priveefinster +Name[ga_IE]=Fuinneog Nua Phríobháideach +Name[gd]=Uinneag phrìobhaideach ùr +Name[gl]=Nova xanela privada +Name[gn]=Ovetã ñemi pyahu +Name[gu_IN]=નવી ખાનગી વિન્ડો +Name[he]=חלון פרטי חדש +Name[hi_IN]=नयी निजी विंडो +Name[hr]=Novi privatni prozor +Name[hsb]=Nowe priwatne wokno +Name[hu]=Új privát ablak +Name[hy_AM]=Սկսել Գաղտնի դիտարկում +Name[id]=Jendela Mode Pribadi Baru +Name[is]=Nýr huliðsgluggi +Name[it]=Nuova finestra anonima +Name[ja]=新しいプライベートウィンドウ +Name[ja_JP-mac]=新規プライベートウインドウ +Name[ka]=ახალი პირადი ფანჯარა +Name[kk]=Жаңа жекелік терезе +Name[km]=បង្អួច​ឯកជន​ថ្មី +Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ +Name[ko]=새 사생활 보호 모드 +Name[kok]=नवो खाजगी विंडो +Name[ks]=نْو پرایوٹ وینڈو& +Name[lij]=Neuvo barcon privou +Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່ +Name[lt]=Naujas privataus naršymo langas +Name[ltg]=Jauns privatais lūgs +Name[lv]=Jauns privātais logs +Name[mai]=नया निज विंडो (W) +Name[mk]=Нов приватен прозорец +Name[ml]=പുതിയ സ്വകാര്യ ജാലകം +Name[mr]=नवीन वैयक्तिक पटल +Name[ms]=Tetingkap Persendirian Baharu +Name[my]=New Private Window +Name[nb_NO]=Nytt privat vindu +Name[ne_NP]=नयाँ निजी सञ्झ्याल +Name[nl]=Nieuw privévenster +Name[nn_NO]=Nytt privat vindauge +Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ +Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ +Name[pl]=Nowe okno prywatne +Name[pt_BR]=Nova janela privativa +Name[pt_PT]=Nova janela privada +Name[rm]=Nova fanestra privata +Name[ro]=Fereastră privată nouă +Name[ru]=Новое приватное окно +Name[sat]=नावा निजेराक् विंडो (W ) +Name[si]=නව පුද්ගලික කවුළුව (W) +Name[sk]=Nové okno v režime Súkromné prehliadanie +Name[sl]=Novo zasebno okno +Name[son]=Sutura zanfun taaga +Name[sq]=Dritare e Re Private +Name[sr]=Нови приватан прозор +Name[sv_SE]=Nytt privat fönster +Name[ta]=புதிய தனிப்பட்ட சாளரம் +Name[te]=కొత్త ఆంతరంగిక విండో +Name[th]=หน้าต่างส่วนตัวใหม่ +Name[tr]=Yeni gizli pencere +Name[tsz]=Juchiiti eraatarakua jimpani +Name[uk]=Приватне вікно +Name[ur]=نیا نجی دریچہ +Name[uz]=Yangi maxfiy oyna +Name[vi]=Cửa sổ riêng tư mới +Name[wo]=Panlanteeru biir bu bees +Name[xh]=Ifestile yangasese entsha +Name[zh_CN]=新建隐私浏览窗口 +Name[zh_TW]=新增隱私視窗 +Exec=firefox-x11 --private-window --name firefox-x11 %u + +[Desktop Action profile-manager-window] +Name=Open the Profile Manager +Name[cs]=Správa profilů +Exec=firefox-x11 --name firefox-x11 --ProfileManager diff --git a/firefox-x11.sh.in b/firefox-x11.sh.in new file mode 100644 index 0000000..94045c9 --- /dev/null +++ b/firefox-x11.sh.in @@ -0,0 +1,7 @@ +#!/usr/bin/bash +# +# Run Firefox on X11 backend +# + +export MOZ_DISABLE_WAYLAND=1 +exec /__PREFIX__/bin/firefox "$@" diff --git a/firefox.spec b/firefox.spec index 7eb5a44..3cb7fd2 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.6.0 -Release: 1%{anolis_release}%{?dist} +Version: 102.7.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -227,12 +225,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}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20221206.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230110.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 @@ -240,6 +238,8 @@ Source24: mozilla-api-key Source25: firefox-symbolic.svg Source26: distribution.ini Source27: google-api-key +Source30: firefox-x11.sh.in +Source31: firefox-x11.desktop Source32: node-stdout-nonblocking-wrapper Source33: firefox.appdata.xml.in Source34: firefox-search-provider.ini @@ -256,7 +256,6 @@ Source45: run-wayland-compositor Source403: nss-3.79.0-6.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 @@ -379,7 +378,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} @@ -432,7 +431,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if !0%{?flatpak} #TODO @@ -602,6 +601,18 @@ This package contains results of tests executed during build. /%{version}-%{release}/failures-* %endif +%if 0%{?rhel} >= 9 +%package x11 +Summary: Firefox X11 launcher. +Requires: %{name} +%description x11 +The firefox-x11 package contains launcher and desktop file +to run Firefox explicitly on X11. +%files x11 +%{_bindir}/firefox-x11 +%{_datadir}/applications/firefox-x11.desktop +%endif + #--------------------------------------------------------------------- %prep @@ -900,23 +911,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 <= 9 +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE31} +%endif # set up the firefox start script %{__rm} -rf %{buildroot}%{_bindir}/firefox @@ -1181,6 +1180,9 @@ sed -i -e 's|%FLATPAK_ENV_VARS%||' %{buildroot}%{_bindir}/firefox sed -i -e 's|%DISABLE_WAYLAND_PLACEHOLDER%|export MOZ_DISABLE_WAYLAND=1|' %{buildroot}%{_bindir}/firefox %else sed -i -e 's|%DISABLE_WAYLAND_PLACEHOLDER%||' %{buildroot}%{_bindir}/firefox +# firefox-x11 launch script for RHEL9 only +%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11 +%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11 %endif %{__install} -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/firefox.1 @@ -1325,9 +1327,7 @@ rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so # libnssckbi.so from the same directory where libnss3.so is loaded (as # of Firefox 89). %if 0%{?flatpak} -%if 0%{?rhel} > 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 #--------------------------------------------------------------------- @@ -1398,9 +1398,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 @@ -1449,9 +1447,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Feb 15 2023 yangxianzhao - 102.6.0-1.0.1 -- rebrand: rebrand for anolis -- feat: fix an7 compile problem +* Tue Jan 10 2023 Eike Rathke - 102.7.0-1 +- Update to 102.7.0 build1 + +* Mon Jan 02 2023 Jan Horak - 102.6.0-2 +- Add firefox-x11 subpackage to allow explicit run of firefox under x11 on RHEL9 * Tue Dec 06 2022 Eike Rathke - 102.6.0-1 - Update to 102.6.0 build1 -- Gitee From 0e558de97f64ecd487a853b885560f801b4f3d45 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Wed, 15 Feb 2023 14:47:45 +0800 Subject: [PATCH 2/2] rebrand to anolis and fix build error --- download | 1 + ...refs.js => firefox-anolis-default-prefs.js | 6 +-- firefox.spec | 44 +++++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (91%) diff --git a/download b/download index 71b8b75..1c4472b 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 04f69b8baa7bd8ddc49d786b04307df8 nss-3.79.0-6.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 91% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 7bf5098..8d3354e 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.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); @@ -36,4 +36,4 @@ pref("browser.gnome-search-provider.enabled",true); /* Enable ffvpx playback for WebRTC */ pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file +pref("storage.nfs_filesystem", true); diff --git a/firefox.spec b/firefox.spec index 3cb7fd2..be9f25c 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.7.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -230,7 +232,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20230110.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 @@ -256,6 +258,7 @@ Source45: run-wayland-compositor Source403: nss-3.79.0-6.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 @@ -378,7 +381,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} @@ -431,7 +434,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if !0%{?flatpak} #TODO @@ -911,8 +914,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 #--------------------------------------------------------------------- @@ -1398,7 +1418,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 @@ -1447,6 +1469,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Feb 15 2023 yangxianzhao - 102.7.0-1.0.1 +- rebrand: rebrand for anolis +- feat: fix an7 compile problem + * Tue Jan 10 2023 Eike Rathke - 102.7.0-1 - Update to 102.7.0 build1 -- Gitee