Fix conditional.

FreeImage-3.17.0_CVE-2016-5684.patch

@@ -1,24 +0,0 @@
-diff -rupN FreeImage/Source/FreeImage/PluginXPM.cpp FreeImage-new/Source/FreeImage/PluginXPM.cpp
---- FreeImage/Source/FreeImage/PluginXPM.cpp	2015-03-02 02:07:08.000000000 +0100
-+++ FreeImage-new/Source/FreeImage/PluginXPM.cpp	2016-10-04 16:40:11.975271194 +0200
-@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle,
- 		}
- 		free(str);
- 
-+		// check info string
-+		if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) {
-+			throw "Improperly formed info string";
-+		}
-+
-         if (colors > 256) {
- 			dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
- 		} else {
-@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle,
- 			FILE_RGBA rgba;
- 
- 			str = ReadString(io, handle);
--			if(!str)
-+			if(!str || (strlen(str) < (size_t)cpp))
- 				throw "Error reading color strings";
- 
- 			std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars

freeimage.spec

@@ -3,7 +3,7 @@
 
 Name:           freeimage
 Version:        3.17.0
-Release:        14%{?dist}
+Release:        3%{?dist}
 Summary:        Multi-format image decoder library
 
 # freeimage is tripple-licensed, see
@@ -18,26 +18,24 @@ Patch0:         FreeImage-3.17.0_unbundle.patch
 Patch1:         FreeImage-3.17.0_doxygen.patch
 # Fix CVE-2015-0852 (#1257859)
 Patch2:         FreeImage-3.17.0_CVE-2015-0852.patch
-# Fix CVE-2016-5684 (#1381517)
-Patch3:         FreeImage-3.17.0_CVE-2016-5684.patch
 
 BuildRequires:  doxygen
-BuildRequires:  gcc-c++
-BuildRequires:  make
-BuildRequires:  jxrlib-devel
+BuildRequires:  OpenEXR-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libwebp-devel
+%if 0%{?fedora}
 BuildRequires:  LibRaw-devel
-BuildRequires:  OpenEXR-devel
+BuildRequires:  jxrlib-devel
 BuildRequires:  openjpeg2-devel
+%endif
 
 %description
 FreeImage is a library for developers who would like to support popular
 graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by
-today's multimedia applications.
+today's multimedia applications. 
 
 
 %package        devel
@@ -71,7 +69,6 @@ developing applications that use %{name}-plus.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # remove all included libs to make sure these don't get used during compile
 rm -r Source/Lib* Source/ZLib Source/OpenEXR
@@ -92,12 +89,12 @@ done
 %build
 sh ./gensrclist.sh
 sh ./genfipsrclist.sh
-%ifarch %{power64} %{mips32}
-%make_build -f Makefile.gnu CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
-%make_build -f Makefile.fip CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
+%ifarch %{power64}
+make -f Makefile.gnu %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
+make -f Makefile.fip %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}"
 %else
-%make_build -f Makefile.gnu CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
-%make_build -f Makefile.fip CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
+make -f Makefile.gnu %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
+make -f Makefile.fip %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
 %endif
 
 pushd Wrapper/FreeImagePlus/doc
@@ -151,39 +148,6 @@ ldconfig -n %{buildroot}%{_libdir}
 
 
 %changelog
-* Sun Feb 18 2018 Sandro Mani <manisandro@gmail.coM> - 3.17.0-14
-- Add missing BR: gcc-c++, make
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 3.17.0-9
-- Rebuild (libwebp)
-
-* Tue Dec 27 2016 Jon Ciesla <limburgher@gmail.com> - 3.17.0-8
-- Rebuild for new LibRaw.
-
-* Tue Oct 04 2016 Sandro Mani <manisandro@gmail.com> - 3.17.0-7
-- Fix CVE-2016-5684 (rhbz#1381517)
-
-* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.0-6
-- -fPIC on 32-bit MIPS
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.17.0-4
-- Rebuilt for libwebp soname bump
-
 * Thu Oct 15 2015 Karsten Hopp <karsten@redhat.com> 3.17.0-3
 - ppc64 and ppc64le need -fPIC (rhbz#1272048)