diff --git a/.abf.yml b/.abf.yml index e8440c8..f1038f6 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935 - firefox-67.0.source.tar.xz: c7a5f3182999e5efed5c714653adc538bb75aa53 + firefox-67.0.1.source.tar.xz: b64c371c7245fea3c39da1f481a252b53bf64dc7 firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f diff --git a/firefox.spec b/firefox.spec index e307252..dabd4ce 100644 --- a/firefox.spec +++ b/firefox.spec @@ -10,7 +10,7 @@ # This also means only STABLE upstream releases, NO betas. # This is a discussed topic. Please, do not flame it again. -%define major 67.0 +%define major 67.0.1 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} @@ -25,7 +25,7 @@ %define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0) %define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0) -%define _use_syshunspell 0 +%define _no_use_syshunspell 0 %define toolkit_gtk3 1 # Firefox 61.0: ERROR: Only GCC 6.1 or newer is supported (found version 5.5.0). @@ -37,7 +37,7 @@ Summary: Next generation web browser Name: firefox Version: %{major} Epoch: %{ff_epoch} -Release: 2 +Release: 1 License: MPLv1+ Group: Networking/WWW Url: http://www.mozilla.com/firefox/ @@ -115,7 +115,7 @@ BuildRequires: libffi-devel %endif BuildRequires: rootcerts >= 1:20110830.00 BuildRequires: pkgconfig(xt) -%if %_use_syshunspell +%if %_no_use_syshunspell BuildRequires: hunspell-devel %endif BuildRequires: doxygen @@ -145,7 +145,7 @@ Requires: indexhtml Requires: xdg-utils # fixes bug #42096 Requires: mailcap -%if %_use_syshunspell +%if %_no_use_syshunspell Suggests: hunspell-en %endif Suggests: %{_lib}canberra0 @@ -386,8 +386,8 @@ cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css } EOF -# use the system myspell dictionaries -%if %_use_syshunspell +# use the no system myspell dictionaries +%if %_no_use_syshunspell rm -fr %{buildroot}%{mozillalibdir}/dictionaries ln -s %{_datadir}/dict/mozilla/ %{buildroot}%{mozillalibdir}/dictionaries %else