diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 73b7ed1b..16be1c76 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -27,7 +27,7 @@ # orig_version 70.0 # orig_suffix b3 # major 69 -# mainver %major.99 +# mainver %%major.99 %define major 111 %define mainver %major.0 %define orig_version 111.0 @@ -246,10 +246,6 @@ Obsoletes: tracker-miner-firefox < 0.15 %if 0%{?devpkg} == 0 Obsoletes: %{name}-devel < %{version} %endif -# libproxy's mozjs pacrunner crashes FF (bnc#759123) -%if 0%{?suse_version} < 1220 -Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 -%endif ExcludeArch: armv6l armv6hl ppc ppc64 ppc64le %description @@ -265,6 +261,7 @@ Provides: firefox-devel = %{version}-%{release} Requires: %{name} = %{version} Requires: perl(Archive::Zip) Requires: perl(XML::Simple) +BuildArch: noarch %description devel Development files for %{appname} to make packaging of addons easier. @@ -433,11 +430,11 @@ ac_add_options --enable-debug-symbols=-g1 %endif ac_add_options --disable-install-strip # building with elf-hack started to fail everywhere with FF73 -#%if 0%{?suse_version} > 1549 +#%%if 0%%{?suse_version} > 1549 %ifarch %arm %ix86 x86_64 ac_add_options --disable-elf-hack %endif -#%endif +#%%endif ac_add_options --with-system-nspr ac_add_options --with-system-nss %if 0%{useccache} != 0 @@ -456,7 +453,7 @@ ac_add_options --disable-debug ac_add_options --enable-update-channel=%{update_channel} ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} # Google-service currently not available for free anymore -#ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19} +#ac_add_options --with-google-location-service-api-keyfile=%%{SOURCE19} ac_add_options --with-google-safebrowsing-api-keyfile=%{SOURCE19} ac_add_options --with-unsigned-addon-scopes=app ac_add_options --allow-addon-sideload @@ -667,7 +664,7 @@ install -m 755 %SOURCE12 %{buildroot}%{_bindir} # inspired by mandriva mkdir -p %{buildroot}%{_rpmmacrodir} cat <<'FIN' >%{buildroot}%{_rpmmacrodir}/macros.%{progname} -# Macros from %{name} package +# Macros from %%{name} package %%firefox_major %{major} %%firefox_version %{version} %%firefox_mainver %{mainver}