[firefox] rawhide build fix
Martin Stransky
stransky at fedoraproject.org
Tue Nov 4 13:51:19 UTC 2014
commit 793ab2260d4bcc05488f4ce625bb62a85c5f4478
Author: Martin Stransky <stransky at redhat.com>
Date: Tue Nov 4 14:51:27 2014 +0100
rawhide build fix
firefox-mozconfig | 1 -
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 at redhat.com> - 33.0-4
+- Do not use system libjpeg-turbo on rawhide
+
* Mon Nov 3 2014 Martin Stransky <stransky at redhat.com> - 33.0-3
- Added Gtk3 support
More information about the scm-commits
mailing list