From c0f1e7b6d5b5b19582d8ba5a54e5040218b6daa9f58a5cb4a8d2713fea76a74b Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Wed, 31 Jan 2018 10:20:29 +0000
Subject: [PATCH] - Update to 1.1.2:   * Fixed possible crash while editing
 polygons   * Fixed hang when loading map file with empty compressed layer
 data   * Fixed selection of tile stamp to work on mouse click   * Fixed tools
 not being up to date on modifier keys after activation   * Fixed "Offset Map"
 action for infinite maps (#1866)   * Templates view: Keep template centered
 when resizing view   * Tile Collision Editor: Keep tile centered when
 resizing view   * Tile Collision Editor: Display tool info text in status bar
   * JSON plugin: Fixed reading of infinite maps (#1858)   * libtiled-java:
 Fixed some bugs (by Henry Wang, #1840)   * libtiled-java: Fixed tile offset
 value not being considered (by digitalhoax, #1863) - Remove upstreamed
 tiled-1.1.0-empty-return.patch

OBS-URL: https://build.opensuse.org/package/show/games:tools/tiled?expand=0&rev=23
---
 tiled-1.1.0-empty-return.patch | 11 -----------
 tiled-1.1.1.tar.gz             |  3 ---
 tiled-1.1.2.tar.gz             |  3 +++
 tiled.changes                  | 17 +++++++++++++++++
 tiled.spec                     |  5 +----
 5 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 tiled-1.1.0-empty-return.patch
 delete mode 100644 tiled-1.1.1.tar.gz
 create mode 100644 tiled-1.1.2.tar.gz

diff --git a/tiled-1.1.0-empty-return.patch b/tiled-1.1.0-empty-return.patch
deleted file mode 100644
index 43f3d76..0000000
--- a/tiled-1.1.0-empty-return.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urEbwB tiled-1.1.0/src/libtiled/tileset.cpp tiled-1.1.0.new/src/libtiled/tileset.cpp
---- tiled-1.1.0/src/libtiled/tileset.cpp	2018-01-03 11:57:44.000000000 +0100
-+++ tiled-1.1.0.new/src/libtiled/tileset.cpp	2018-01-04 12:00:09.806029317 +0100
-@@ -786,6 +786,7 @@
-     case Tileset::Isometric:
-         return QLatin1String("isometric");
-     }
-+    return QString();
- }
- 
- Tileset::Orientation Tileset::orientationFromString(const QString &string)
diff --git a/tiled-1.1.1.tar.gz b/tiled-1.1.1.tar.gz
deleted file mode 100644
index 7d959d2..0000000
--- a/tiled-1.1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:638ac1cd2aea3f856b83a6b5f6017eb86e27037da86a018d946b061e47e05b80
-size 15965530
diff --git a/tiled-1.1.2.tar.gz b/tiled-1.1.2.tar.gz
new file mode 100644
index 0000000..3da6ba1
--- /dev/null
+++ b/tiled-1.1.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8003956759636a0230e59ce4cb7cfd917e27270a23aeab8b02d181d040609c50
+size 15967235
diff --git a/tiled.changes b/tiled.changes
index d49cb98..649bd5d 100644
--- a/tiled.changes
+++ b/tiled.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jan 31 09:51:59 UTC 2018 - mvetter@suse.com
+
+- Update to 1.1.2:
+  * Fixed possible crash while editing polygons
+  * Fixed hang when loading map file with empty compressed layer data
+  * Fixed selection of tile stamp to work on mouse click
+  * Fixed tools not being up to date on modifier keys after activation
+  * Fixed "Offset Map" action for infinite maps (#1866)
+  * Templates view: Keep template centered when resizing view
+  * Tile Collision Editor: Keep tile centered when resizing view
+  * Tile Collision Editor: Display tool info text in status bar
+  * JSON plugin: Fixed reading of infinite maps (#1858)
+  * libtiled-java: Fixed some bugs (by Henry Wang, #1840)
+  * libtiled-java: Fixed tile offset value not being considered (by digitalhoax, #1863)
+- Remove upstreamed tiled-1.1.0-empty-return.patch
+
 -------------------------------------------------------------------
 Fri Jan  5 09:49:27 UTC 2018 - mvetter@suse.com
 
diff --git a/tiled.spec b/tiled.spec
index 4df2480..3b892c3 100644
--- a/tiled.spec
+++ b/tiled.spec
@@ -17,15 +17,13 @@
 
 
 Name:           tiled
-Version:        1.1.1
+Version:        1.1.2
 Release:        0
 Summary:        A tilemap editor
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Other
 Url:            http://www.mapeditor.org
 Source:         https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-# FIX-UPSTREAM - jubahl@iodoru.org - https://github.com/bjorn/tiled/pull/1846
-Patch0:         tiled-1.1.0-empty-return.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -63,7 +61,6 @@ This package contains libtiled a library for the Tiled map editor.
 
 %prep
 %setup -q
-%patch0 -p1
 # Remove copy of zlib
 rm -rf src/zlib