diff options
| author | Martin Stransky <stransky@redhat.com> | 2014-11-04 14:51:27 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2014-11-04 14:51:27 +0100 |
| commit | 793ab2260d4bcc05488f4ce625bb62a85c5f4478 (patch) | |
| tree | f46941e7eeb460d05c3c0cb2212b114d80e7372a | |
| parent | Build fix - gtk3 needs also gtk2 to build NPAPI plugin support (diff) | |
| download | librewolf-fedora-ff-793ab2260d4bcc05488f4ce625bb62a85c5f4478.tar.gz librewolf-fedora-ff-793ab2260d4bcc05488f4ce625bb62a85c5f4478.tar.bz2 librewolf-fedora-ff-793ab2260d4bcc05488f4ce625bb62a85c5f4478.zip | |
rawhide build fix
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox.spec | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig index 749a012..79c4014 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -2,7 +2,6 @@ ac_add_options --prefix="$PREFIX" ac_add_options --libdir="$LIBDIR" -ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-libvpx diff --git a/firefox.spec b/firefox.spec index 41f3388..69cf634 100644 --- a/firefox.spec +++ b/firefox.spec @@ -105,7 +105,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 33.0 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -405,6 +405,13 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig echo "ac_add_options --enable-tests" >> .mozconfig %endif +# Hack - FF does not support new jpeg turbo library +%if 0%{?fedora} > 21 +echo "ac_add_options --without-system-jpeg" >> .mozconfig +%else +echo "ac_add_options --with-system-jpeg" >> .mozconfig +%endif + #--------------------------------------------------------------------- %build @@ -754,6 +761,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Nov 4 2014 Martin Stransky <stransky@redhat.com> - 33.0-4 +- Do not use system libjpeg-turbo on rawhide + * Mon Nov 3 2014 Martin Stransky <stransky@redhat.com> - 33.0-3 - Added Gtk3 support |