From b8b58396fcfdce223d53ef08124a3d9e92ac4e2aefa153efae361c3f1f1076ba Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Fri, 12 Jan 2018 11:21:21 +0000
Subject: [PATCH] KDE Applications 17.12.1

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kqtquickcharts?expand=0&rev=61
---
 Add-missing-types-to-qmldir.patch | 26 --------------------------
 kqtquickcharts-17.12.0.tar.xz     |  3 ---
 kqtquickcharts-17.12.1.tar.xz     |  3 +++
 kqtquickcharts.changes            | 13 +++++++++++++
 kqtquickcharts.spec               |  5 +----
 5 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 Add-missing-types-to-qmldir.patch
 delete mode 100644 kqtquickcharts-17.12.0.tar.xz
 create mode 100644 kqtquickcharts-17.12.1.tar.xz

diff --git a/Add-missing-types-to-qmldir.patch b/Add-missing-types-to-qmldir.patch
deleted file mode 100644
index 66e03cd..0000000
--- a/Add-missing-types-to-qmldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e90e87e7522230387c1bdf7b95d8177ea3a7486 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 20 Dec 2017 21:09:26 +0100
-Subject: Add missing types to qmldir
-
-Otherwise ktouch will refuse to load with Qt 5.10, which seems to be more strict with respect to QML files loading.
-
-Differential Revision: https://phabricator.kde.org/D9436
----
- src/qml/qmldir | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/qml/qmldir b/src/qml/qmldir
-index 41359d9..780493f 100644
---- a/src/qml/qmldir
-+++ b/src/qml/qmldir
-@@ -3,4 +3,6 @@
- LineChart 0.1 LineChart.qml
- LegendItem 0.1 LegendItem.qml
- XYChart 0.1 XYChart.qml
-+internal Label Label.qml
-+internal LineLabel LineLabel.qml
- plugin kqtquickcharts
--- 
-cgit v0.11.2
-
diff --git a/kqtquickcharts-17.12.0.tar.xz b/kqtquickcharts-17.12.0.tar.xz
deleted file mode 100644
index 6b775db..0000000
--- a/kqtquickcharts-17.12.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf69acee4ebc7a747f48b9aaf09459e266205c6caddc47c2c37af7682d326e0b
-size 25512
diff --git a/kqtquickcharts-17.12.1.tar.xz b/kqtquickcharts-17.12.1.tar.xz
new file mode 100644
index 0000000..42df98a
--- /dev/null
+++ b/kqtquickcharts-17.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:719f4fc3faf0dbd4c644e64b290181032399a1ec752648320f34f756d2b6f726
+size 25512
diff --git a/kqtquickcharts.changes b/kqtquickcharts.changes
index bc0be9f..013214f 100644
--- a/kqtquickcharts.changes
+++ b/kqtquickcharts.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jan 11 23:41:16 CET 2018 - lbeltrame@kde.org
+
+- Update to 17.12.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-17.12.1.php
+- Changes since 17.12.0:
+  * Mark Label and LineLabel types as internal
+  * Add missing types to qmldir
+- Dropped patches, now upstream:
+  * Add-missing-types-to-qmldir.patch
+
 -------------------------------------------------------------------
 Thu Dec 21 12:45:16 UTC 2017 - wbauer@tmo.at
 
diff --git a/kqtquickcharts.spec b/kqtquickcharts.spec
index a2b8971..6c2bb99 100644
--- a/kqtquickcharts.spec
+++ b/kqtquickcharts.spec
@@ -17,7 +17,7 @@
 
 
 Name:           kqtquickcharts
-Version:        17.12.0
+Version:        17.12.1
 Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
@@ -27,8 +27,6 @@ License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch:          Add-missing-types-to-qmldir.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  pkgconfig
@@ -42,7 +40,6 @@ A QtQuick plugin to render beautiful and interactive graphs.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
   %cmake_kf5 -d build