[mingw-libjpeg-turbo] Fix compatibility with older CMake versions (as used on RHEL7)
Erik van Pienbroek
epienbro at fedoraproject.org
Thu May 29 15:01:43 UTC 2014
commit f40c4581f5fc89a5b3e22b5c04c6acc3721b6439
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu May 29 17:01:43 2014 +0200
Fix compatibility with older CMake versions (as used on RHEL7)
libjpeg-turbo-r1237.patch | 14 ++++++++++++++
mingw-libjpeg-turbo.spec | 9 ++++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/libjpeg-turbo-r1237.patch b/libjpeg-turbo-r1237.patch
new file mode 100644
index 0000000..de3480e
--- /dev/null
+++ b/libjpeg-turbo-r1237.patch
@@ -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)
diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec
index 7ef04ba..24d622e 100644
--- a/mingw-libjpeg-turbo.spec
+++ b/mingw-libjpeg-turbo.spec
@@ -6,7 +6,7 @@
Name: mingw-libjpeg-turbo
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Libjpeg-turbo library
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
Patch0: libjpeg-turbo-match-autoconf-behavior.patch
+# Fix compatibility with older CMake versions (as used on RHEL7)
+Patch1: libjpeg-turbo-r1237.patch
+
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 95
@@ -80,6 +83,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
%prep
%setup -q -n libjpeg-turbo-%{version}
%patch0 -p1
+%patch1 -p1
%build
@@ -150,6 +154,9 @@ chmod -x README-turbo.txt
%changelog
+* Thu May 29 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.1-2
+- Fix compatibility with older CMake versions (as used on RHEL7)
+
* Thu May 29 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.1-1
- Update to 1.3.1
- Fixes CVE-2013-6629 and CVE-2013-6630 (RHBZ #1031740)
More information about the scm-commits
mailing list