[icecat] libjpeg-turbo unbundled (bz#1164815).

[Antonio Trande]

commit dcc8ead4abd1c46a06e7e500b2262e9809a868de
Author: sagitter <sagitterATfedoraprojectDOTorg>
Date:   Thu Nov 27 21:21:56 2014 +0100

    libjpeg-turbo unbundled (bz#1164815).

 icecat-mozconfig-common |    1 -
 icecat.spec             |   14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
index a2cfd77..360d0f5 100644
--- a/icecat-mozconfig-common
+++ b/icecat-mozconfig-common
@@ -38,7 +38,6 @@ ac_add_options --disable-ffmpeg
 ac_add_options --enable-media-plugins
 ac_add_options --enable-png-arm-neon-support=check
 ac_add_options --disable-compile-environment
-ac_add_options --enable-libjpeg-turbo
 ac_add_options --enable-shared-js
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-extensions=default
diff --git a/icecat.spec b/icecat.spec
index 5d2005e..dd0c3ff 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -11,7 +11,7 @@
 
 Name:    icecat
 Version: 31.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: GNU version of Firefox browser
 Group:   Applications/Internet
 
@@ -82,7 +82,8 @@ BuildRequires:  libzip-devel
 BuildRequires:  nspr-devel
 BuildRequires:  nss-devel, nss-static
 BuildRequires:  nss-util-devel, nss-tools
-#BuildRequires:  openjpeg-devel, libjpeg-turbo-devel
+BuildRequires:  openjpeg-devel
+BuildRequires:  libjpeg-turbo-devel >= 1.3.90
 BuildRequires:  pango-devel
 BuildRequires:  python2-devel
 BuildRequires:  python-blessings
@@ -107,7 +108,6 @@ Provides:       webclient
 
 ## FPC ticket https://fedorahosted.org/fpc/ticket/391
 ## Further bundled files on IceCat 31.1.1, bz#1153135
-Provides:       bundled(libjpeg-turbo) = 1.3.1
 Provides:       bundled(libtheora) = 1.2.0
 Provides:       bundled(libvorbis) = 1.3.4
 Provides:       bundled(libogg)    = 1.3.0
@@ -260,12 +260,15 @@ mkdir -p %{name}-objdir && cd %{name}-objdir
  --enable-system-hunspell \
  --enable-system-pixman \
  --enable-system-sqlite \
+ --with-system-jpeg \
  --with-system-zlib \
  --with-system-bz2 \
  --with-system-libevent \
  --disable-tests \
  --disable-elf-hack \
- --enable-compile-environment
+ --enable-compile-environment \
+ --disable-libjpeg-turbo \
+ --with-system-jpeg=%{_bindir}
 
 %ifarch s390 %{arm} ppc aarch64
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@@ -366,6 +369,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{icecat_ver}.desk
 %{_includedir}/%{icecat_ver}/
 
 %changelog
+* Wed Nov 26 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-6
+- libjpeg-turbo unbundled (bz#1164815)
+
 * Thu Nov 06 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-5
 - Added -Wno-error=declaration-after-statement
 - Built against GStreamer-1.0