pool/krdc
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 405527 from KDE:Applications

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/405527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krdc?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2016-07-03 10:27:23 +00:00 committed by Git OBS Bridge
commit 886016aa84
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fix-bookmarks-migration.patch Normal file
View File

@ -0,0 +1,28 @@
From: Wolfgang Bauer <wbauer@tmo.at>
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);

11
krdc.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jun 29 14:56:41 UTC 2016 - wbauer@tmo.at
- 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 - fvogt@suse.com
- Fix copying of icons from oxygen package
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 10 18:04:03 UTC 2016 - tittiatcoke@gmail.com Fri Jun 10 18:04:03 UTC 2016 - tittiatcoke@gmail.com

12
krdc.spec
View File

@ -42,6 +42,8 @@ Summary: Remote Desktop Connection
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Remote Desktop Group: Productivity/Networking/Remote Desktop
Source0: %{name}-%{version}.tar.xz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: freerdp Requires: freerdp
Requires: breeze5-icons Requires: breeze5-icons
@ -59,6 +61,7 @@ Development libraries and headers needed to build software using krdc
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch -p1
%build %build
%ifarch ppc ppc64 %ifarch ppc ppc64
@ -72,13 +75,10 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
for i in 128 16 22 32 48 64 for i in 128 16 22 32 48 64
do do
mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps 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 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 %suse_update_desktop_file -r org.kde.krdc System RemoteAccess
%post -p /sbin/ldconfig %post -p /sbin/ldconfig