From d9df5e03b666a6f4771ae4479478ea3ffad6eee99a863bd42a3b9c0209fc1cbc Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Wed, 17 May 2017 19:57:51 +0000
Subject: [PATCH] KDE Applications 17.04.1 checkin
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=73
---
enable-numericMode-in-filetree.patch | 31 ----------------------------
kate-17.04.0.tar.xz | 3 ---
kate-17.04.1.tar.xz | 3 +++
kate.changes | 14 +++++++++++++
kate.spec | 5 +----
5 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 enable-numericMode-in-filetree.patch
delete mode 100644 kate-17.04.0.tar.xz
create mode 100644 kate-17.04.1.tar.xz
diff --git a/enable-numericMode-in-filetree.patch b/enable-numericMode-in-filetree.patch
deleted file mode 100644
index 9c86724..0000000
--- a/enable-numericMode-in-filetree.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From eb9cab2e55ba9b7f9b86577ba12f673c40e07e67 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Fri, 14 Apr 2017 12:43:10 +0200
-Subject: Enable numericMode for sorting document list in filetree
-
-Turns on "natural" sorting for the document list in the filetree addon,
- so that e.g. 10 comes after 9, not before.
-That's how the KDE4 version behaved too.
-
-BUG: 375676
-FIXED-IN: 17.04.1
-Differential Revision: https://phabricator.kde.org/D5448
----
- addons/filetree/katefiletreeproxymodel.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/addons/filetree/katefiletreeproxymodel.cpp b/addons/filetree/katefiletreeproxymodel.cpp
-index 13a4d0e..206dfb8 100644
---- a/addons/filetree/katefiletreeproxymodel.cpp
-+++ b/addons/filetree/katefiletreeproxymodel.cpp
-@@ -49,6 +49,7 @@ bool KateFileTreeProxyModel::lessThan(const QModelIndex &left, const QModelIndex
-
- QCollator collate;
- collate.setCaseSensitivity(Qt::CaseInsensitive);
-+ collate.setNumericMode(true);
-
- switch (sortRole()) {
- case Qt::DisplayRole: {
---
-cgit v0.11.2
-
diff --git a/kate-17.04.0.tar.xz b/kate-17.04.0.tar.xz
deleted file mode 100644
index 028b142..0000000
--- a/kate-17.04.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042
-size 5213352
diff --git a/kate-17.04.1.tar.xz b/kate-17.04.1.tar.xz
new file mode 100644
index 0000000..4af5c29
--- /dev/null
+++ b/kate-17.04.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34eee6c384e2c2776c7d0ab65e7217e730cdbdecb82578c9dc90380cb82affd2
+size 5214608
diff --git a/kate.changes b/kate.changes
index 1b19db3..9214038 100644
--- a/kate.changes
+++ b/kate.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed May 17 20:35:54 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-17.04.1.php
+- Changes since 17.04.0:
+ * Don't repeat work of KAboutData::setupCommandLine()
+ * Don't repeat work of KAboutData::setApplicationData()
+ * Enable numericMode for sorting document list in filetree (kde#375676)
+- Drop upstreamed patches:
+ * enable-numericMode-in-filetree.patch
+
-------------------------------------------------------------------
Sun Apr 16 23:15:49 UTC 2017 - wbauer@tmo.at
diff --git a/kate.spec b/kate.spec
index 6592247..a98b37c 100644
--- a/kate.spec
+++ b/kate.spec
@@ -19,7 +19,7 @@
%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
Name: kate
-Version: 17.04.0
+Version: 17.04.1
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
@@ -30,8 +30,6 @@ License: GPL-2.0+
Group: Productivity/Editors/Other
Url: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch: enable-numericMode-in-filetree.patch
BuildRequires: kactivities5-devel
BuildRequires: kconfig-devel
BuildRequires: kcrash-devel
@@ -95,7 +93,6 @@ plugins and data files for Kate and KWrite editors.
%prep
%setup -q
-%patch -p1
%build
%cmake_kf5 -d build