Hello community, here is the log from the commit of package innoextract for openSUSE:Factory checked in at 2016-03-17 16:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/innoextract (Old) and /work/SRC/openSUSE:Factory/.innoextract.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "innoextract" Changes: -------- --- /work/SRC/openSUSE:Factory/innoextract/innoextract.changes 2015-11-12 19:41:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.innoextract.new/innoextract.changes 2016-03-17 16:48:45.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 16 07:57:11 UTC 2016 - [email protected] + +- Fix build with CMake 3.5 + * innoextract-cmake.patch + +------------------------------------------------------------------- New: ---- innoextract-cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ innoextract.spec ++++++ --- /var/tmp/diff_new_pack.4M8AcS/_old 2016-03-17 16:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.4M8AcS/_new 2016-03-17 16:48:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package innoextract # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -25,6 +25,8 @@ Group: Productivity/Archiving/Backup Url: http://constexpr.org/innoextract/ Source: http://constexpr.org/innoextract/files/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM innoextract-cmake.patch gh#50 +Patch0: innoextract-cmake.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.8.0 BuildRequires: doxygen @@ -42,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake @@ -54,6 +57,6 @@ %defattr(-,root,root) %doc CHANGELOG LICENSE README.md %{_bindir}/innoextract -%{_mandir}/man1/innoextract.1* +%{_mandir}/man1/innoextract.1%{ext_man} %changelog ++++++ innoextract-cmake.patch ++++++ >From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer <[email protected]> Date: Tue, 23 Feb 2016 05:45:50 +0100 Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if() This makes the build system more rubust against stray variables coming from included CMake scripts provided by the system. Fixes build with CMake 3.5 (tested with 3.5.0-rc3). Fixes: issue #50 --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02e0308..8653b93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,11 @@ project(innoextract) cmake_minimum_required(VERSION 2.8) +if(POLICY CMP0054) + # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted. + cmake_policy(SET CMP0054 NEW) +endif() + # Define configuration options
