Fix compatibility with older CMake versions (as used on RHEL7)

This commit is contained in:
Erik van Pienbroek 2014-05-29 17:01:43 +02:00
parent 4dc43ceafb
commit f40c4581f5
2 changed files with 22 additions and 1 deletions

14
libjpeg-turbo-r1237.patch Normal file
View File

@ -0,0 +1,14 @@
--- libjpeg-turbo-1.3.1/CMakeLists.txt.orig 2014-05-29 17:00:31.775255437 +0200
+++ libjpeg-turbo-1.3.1/CMakeLists.txt 2014-05-29 17:01:07.174824178 +0200
@@ -3,7 +3,10 @@
#
cmake_minimum_required(VERSION 2.8.8)
-cmake_policy(SET CMP0022 OLD)
+# Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES
+if(POLICY CMP0022)
+ cmake_policy(SET CMP0022 OLD)
+endif()
project(libjpeg-turbo C)
set(VERSION 1.3.1)

View File

@ -6,7 +6,7 @@
Name: mingw-libjpeg-turbo Name: mingw-libjpeg-turbo
Version: 1.3.1 Version: 1.3.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW Windows Libjpeg-turbo library Summary: MinGW Windows Libjpeg-turbo library
License: wxWidgets License: wxWidgets
@ -18,6 +18,9 @@ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{v
# https://bugzilla.redhat.com/show_bug.cgi?id=843193 # https://bugzilla.redhat.com/show_bug.cgi?id=843193
Patch0: libjpeg-turbo-match-autoconf-behavior.patch Patch0: libjpeg-turbo-match-autoconf-behavior.patch
# Fix compatibility with older CMake versions (as used on RHEL7)
Patch1: libjpeg-turbo-r1237.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-filesystem >= 95
@ -80,6 +83,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
%prep %prep
%setup -q -n libjpeg-turbo-%{version} %setup -q -n libjpeg-turbo-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
@ -150,6 +154,9 @@ chmod -x README-turbo.txt
%changelog %changelog
* Thu May 29 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.3.1-2
- Fix compatibility with older CMake versions (as used on RHEL7)
* Thu May 29 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.3.1-1 * Thu May 29 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.3.1-1
- Update to 1.3.1 - Update to 1.3.1
- Fixes CVE-2013-6629 and CVE-2013-6630 (RHBZ #1031740) - Fixes CVE-2013-6629 and CVE-2013-6630 (RHBZ #1031740)