From daf9f883cb338b3dd3719bbb4ca7667d4049fad61bbfb2bdd4a709d9446c90d9 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 25 Mar 2016 08:33:58 +0000
Subject: [PATCH] =?UTF-8?q?-=20Update=20to=201.6=20=20=20*=20Added=20suppo?=
 =?UTF-8?q?rt=20for=20Inno=20Setup=205.5.7=20(and=205.5.8)=20installers=20?=
 =?UTF-8?q?=20=20*=20Added=20a=20--collisions=3Drename-all=20option=20=20?=
 =?UTF-8?q?=20*=20Fixed=20issues=20with=20the=20--collisions=3Drename=20op?=
 =?UTF-8?q?tion=20=20=20*=20Unsafe=20characters=20in=20special=20constant?=
 =?UTF-8?q?=20strings=20(ie=20:=20in=20=20=20=20=20{code:=E2=80=A6})=20are?=
 =?UTF-8?q?=20now=20replaced=20with=20$=20=20=20*=20Windows:=20Fixed=20pro?=
 =?UTF-8?q?gress=20bar=20flickering=20while=20printing=20extracted=20=20?=
 =?UTF-8?q?=20=20=20filenames=20=20=20*=20Windows=20binaries:=20Fixed=20cr?=
 =?UTF-8?q?ash=20on=20platforms=20without=20AVX=20support=20-=20Drop=20ups?=
 =?UTF-8?q?tream=20patch=20innoextract-cmake.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/Archiving/innoextract?expand=0&rev=13
---
 innoextract-1.5.tar.gz  |  3 ---
 innoextract-1.6.tar.gz  |  3 +++
 innoextract-cmake.patch | 30 ------------------------------
 innoextract.changes     | 14 ++++++++++++++
 innoextract.spec        |  5 +----
 5 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 innoextract-1.5.tar.gz
 create mode 100644 innoextract-1.6.tar.gz
 delete mode 100644 innoextract-cmake.patch

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 <daniel@constexpr.org>
-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