Hello community, here is the log from the commit of package krdc for openSUSE:Factory checked in at 2016-07-03 12:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krdc (Old) and /work/SRC/openSUSE:Factory/.krdc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krdc" Changes: -------- --- /work/SRC/openSUSE:Factory/krdc/krdc.changes 2016-06-20 11:02:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krdc.new/krdc.changes 2016-07-03 12:27:24.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 29 14:56:41 UTC 2016 - [email protected] + +- Add fix-bookmarks-migration.patch to fix bookmarks migration from + the KDE4 version (boo#983900, kde#361823) + +------------------------------------------------------------------- +Mon Jun 27 18:48:44 UTC 2016 - [email protected] + +- Fix copying of icons from oxygen package + +------------------------------------------------------------------- New: ---- fix-bookmarks-migration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krdc.spec ++++++ --- /var/tmp/diff_new_pack.UX8THA/_old 2016-07-03 12:27:25.000000000 +0200 +++ /var/tmp/diff_new_pack.UX8THA/_new 2016-07-03 12:27:25.000000000 +0200 @@ -42,6 +42,8 @@ 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 @@ -59,6 +61,7 @@ %prep %setup -q -n %{name}-%{version} +%patch -p1 %build %ifarch ppc ppc64 @@ -72,13 +75,10 @@ for i in 128 16 22 32 48 64 do mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps + cp %{_kf5_iconsdir}/oxygen/${i}x${i}/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps/ \ + || cp %{_kf5_iconsdir}/oxygen/base/${i}x${i}/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps/ done - cp %{_kf5_iconsdir}/oxygen/128x128/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/128x128/apps/ - cp %{_kf5_iconsdir}/oxygen/16x16/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/16x16/apps/ - cp %{_kf5_iconsdir}/oxygen/22x22/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/22x22/apps/ - cp %{_kf5_iconsdir}/oxygen/32x32/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/ - cp %{_kf5_iconsdir}/oxygen/48x48/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/ - cp %{_kf5_iconsdir}/oxygen/64x64/apps/krdc.png %{buildroot}%{_kf5_iconsdir}/hicolor/64x64/apps/ + %suse_update_desktop_file -r org.kde.krdc System RemoteAccess %post -p /sbin/ldconfig ++++++ fix-bookmarks-migration.patch ++++++ From: Wolfgang Bauer <[email protected]> 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);
