From 59e67cea655538cbbb77850bba9b82a47559af748d7387ff39760b2d870a5e9a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 8 Jul 2016 09:16:43 +0000 Subject: [PATCH] Accepting request 407207 from home:favogt:branches:KDE:Applications Fix build by removing upstreamed fix-bookmarks-migration.patch OBS-URL: https://build.opensuse.org/request/show/407207 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/krdc?expand=0&rev=35 --- fix-bookmarks-migration.patch | 28 ---------------------------- krdc.changes | 5 +++++ krdc.spec | 3 --- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 fix-bookmarks-migration.patch diff --git a/fix-bookmarks-migration.patch b/fix-bookmarks-migration.patch deleted file mode 100644 index a0532fc..0000000 --- a/fix-bookmarks-migration.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Wolfgang Bauer -Date: Sat, 25 Jun 2016 11:12:46 +0000 -Subject: Fix bookmarks migration from the KDE4 version -X-Git-Url: http://quickgit.kde.org/?p=krdc.git&a=commitdiff&h=7d9ad0152dbc47c30f261c9d4c026e01bea31b7d ---- -Fix bookmarks migration from the KDE4 version - -targetBasePath needs a trailing slash because the file name is appended -afterwards. - -BUG: 361823 -FIXED-IN: 16.04.3 -REVIEW: 128281 ---- - - ---- a/main.cpp -+++ b/main.cpp -@@ -52,7 +52,7 @@ - if (migrate.migrate()) { - Kdelibs4Migration dataMigrator; - const QString sourceBasePath = dataMigrator.saveLocation("data", QStringLiteral("krdc")); -- const QString targetBasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdc"); -+ const QString targetBasePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdc/"); - QString targetFilePath; - QDir sourceDir(sourceBasePath); - QDir targetDir(targetBasePath); - diff --git a/krdc.changes b/krdc.changes index dd7ed41..1caecba 100644 --- a/krdc.changes +++ b/krdc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 8 06:35:57 UTC 2016 - fvogt@suse.com + +- Fix build by removing upstreamed fix-bookmarks-migration.patch + ------------------------------------------------------------------- Fri Jul 8 00:12:18 UTC 2016 - tittiatcoke@gmail.com diff --git a/krdc.spec b/krdc.spec index a70f242..7c81e97 100644 --- a/krdc.spec +++ b/krdc.spec @@ -42,8 +42,6 @@ Summary: Remote Desktop Connection License: GPL-2.0+ Group: Productivity/Networking/Remote Desktop Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM fix-bookmarks-migration.patch boo#983900, kde#361823 -- fix bookmarks migration from the KDE4 version -Patch: fix-bookmarks-migration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: freerdp Requires: breeze5-icons @@ -61,7 +59,6 @@ Development libraries and headers needed to build software using krdc %prep %setup -q -n %{name}-%{version} -%patch -p1 %build %ifarch ppc ppc64