From 381ce413025c3ba6317109de5bd742fe869cf601 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 1 Oct 2015 00:42:35 +0200 Subject: [PATCH] Fix under-linked library --- FreeImage-3.17.0_unbundle.patch | 4 ++-- freeimage.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/FreeImage-3.17.0_unbundle.patch b/FreeImage-3.17.0_unbundle.patch index d5729bc..59084ae 100644 --- a/FreeImage-3.17.0_unbundle.patch +++ b/FreeImage-3.17.0_unbundle.patch @@ -88,8 +88,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu -# LibJXR -CXXFLAGS += -D__ANSI__ -CXXFLAGS += $(INCLUDE) -+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp zlib) -+override LDFLAGS += -ljpeg -ljpegxr $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp zlib) ++override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ++override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) - CFLAGS += -fPIC diff --git a/freeimage.spec b/freeimage.spec index 09fa0c3..c49a26d 100644 --- a/freeimage.spec +++ b/freeimage.spec @@ -3,7 +3,7 @@ Name: freeimage Version: 3.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-format image decoder library # freeimage is tripple-licensed, see @@ -141,6 +141,9 @@ ldconfig -n %{buildroot}%{_libdir} %changelog +* Wed Sep 30 2015 Sandro Mani - 3.17.0-2 +- Fix under-linked library + * Thu Sep 17 2015 Sandro Mani - 3.17.0-1 - Update to 3.17.0 - Add fix for CVE-2015-0852 (#1257859)