From 688bd9b12e42b7982a1443516d8c5a1aa423b50e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 28 Aug 2018 14:01:32 +0200 Subject: [PATCH] Update to 62.0, spec file tweaks - removed unused options --- firefox-mozconfig | 1 - firefox.spec | 26 +------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/firefox-mozconfig b/firefox-mozconfig index 50f9fe8..d64b691 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -4,7 +4,6 @@ ac_add_options --prefix="$PREFIX" ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests #ac_add_options --enable-libnotify diff --git a/firefox.spec b/firefox.spec index d848120..78a6eff 100644 --- a/firefox.spec +++ b/firefox.spec @@ -8,20 +8,9 @@ # Build with Wayland Gtk+ backend? %global wayland_backend 1 -# Use system hunspell? -%if 0%{?fedora} > 25 -# Disable due to rhbz#1593494 -%global system_hunspell 0 -%else -%global system_hunspell 0 -%endif - # Use system sqlite? -%if 0%{?fedora} > 28 -%global system_sqlite 1 -%else %global system_sqlite 0 -%endif + %global system_ffi 1 # Use system cairo? @@ -31,11 +20,7 @@ %global system_libvpx 1 # Use system libicu? -%if 0%{?fedora} > 27 %global system_libicu 0 -%else -%global system_libicu 0 -%endif # Big endian platforms %ifarch ppc64 s390x @@ -195,9 +180,6 @@ BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(freetype2) >= %{freetype_version} BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xrender) -%if %{?system_hunspell} -BuildRequires: pkgconfig(hunspell) -%endif BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libnotify) >= %{libnotify_version} BuildRequires: pkgconfig(dri) @@ -406,12 +388,6 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig echo "ac_add_options --disable-elf-hack" >> .mozconfig %endif -%if %{?system_hunspell} -echo "ac_add_options --enable-system-hunspell" >> .mozconfig -%else -echo "ac_add_options --disable-system-hunspell" >> .mozconfig -%endif - %if %{?debug_build} echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig