diff --git a/innoextract-1.5.tar.gz b/innoextract-1.5.tar.gz deleted file mode 100644 index 1d94e5d..0000000 --- a/innoextract-1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf -size 179582 diff --git a/innoextract-1.6.tar.gz b/innoextract-1.6.tar.gz new file mode 100644 index 0000000..1837fa8 --- /dev/null +++ b/innoextract-1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66463f145fffd4d5883c6b3e2f7b2c2837d6f07095810114e514233a88c1033e +size 183380 diff --git a/innoextract-cmake.patch b/innoextract-cmake.patch deleted file mode 100644 index f7e7db1..0000000 --- a/innoextract-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001 -From: Daniel Scharrer -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 diff --git a/innoextract.changes b/innoextract.changes index 3a21cb1..0a81b64 100644 --- a/innoextract.changes +++ b/innoextract.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Mar 25 08:30:00 UTC 2016 - mpluskal@suse.com + +- Update to 1.6 + * Added support for Inno Setup 5.5.7 (and 5.5.8) installers + * Added a --collisions=rename-all option + * Fixed issues with the --collisions=rename option + * Unsafe characters in special constant strings (ie : in + {code:…}) are now replaced with $ + * Windows: Fixed progress bar flickering while printing extracted + filenames + * Windows binaries: Fixed crash on platforms without AVX support +- Drop upstream patch innoextract-cmake.patch + ------------------------------------------------------------------- Wed Mar 16 07:57:11 UTC 2016 - mpluskal@suse.com diff --git a/innoextract.spec b/innoextract.spec index e702e04..a0ee9f2 100644 --- a/innoextract.spec +++ b/innoextract.spec @@ -18,15 +18,13 @@ Name: innoextract -Version: 1.5 +Version: 1.6 Release: 0 Summary: A tool to extract Inno Setup installers under non-windows systems License: Zlib 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 @@ -44,7 +42,6 @@ supports installers created by Inno Setup 1.2.10 to 5.4.3. %prep %setup -q -%patch0 -p1 %build %cmake