From 621c062c76e063e1439d5d8e3fe066042d6bb429f79e47005d24b3e97863b131 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 27 Jun 2016 19:02:58 +0000 Subject: [PATCH] Accepting request 405062 from home:favogt:branches:KDE:Applications Fix copying of oxygen icons OBS-URL: https://build.opensuse.org/request/show/405062 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/krfb?expand=0&rev=32 --- krfb.changes | 5 +++++ krfb.spec | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/krfb.changes b/krfb.changes index f68768a..fd93bd2 100644 --- a/krfb.changes +++ b/krfb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 27 18:56:52 UTC 2016 - fvogt@suse.com + +- Fix copying of oxygen icons + ------------------------------------------------------------------- Fri Jun 10 18:04:31 UTC 2016 - tittiatcoke@gmail.com diff --git a/krfb.spec b/krfb.spec index e8cc56d..cdf1ba2 100644 --- a/krfb.spec +++ b/krfb.spec @@ -63,17 +63,15 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %install cd build %makeinstall - for i in 128 64 48 32 22 16 - do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/ - done - cp /usr/share/icons/oxygen/128x128/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ - cp /usr/share/icons/oxygen/16x16/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/ - cp /usr/share/icons/oxygen/22x22/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/ - cp /usr/share/icons/oxygen/32x32/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ - cp /usr/share/icons/oxygen/48x48/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ - cp /usr/share/icons/oxygen/64x64/apps/krfb.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ cd .. + + 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/krfb.png %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps/ \ + || cp %{_kf5_iconsdir}/oxygen/base/${i}x${i}/apps/krfb.png %{buildroot}%{_kf5_iconsdir}/hicolor/${i}x${i}/apps/ + done + %suse_update_desktop_file -r org.kde.krfb System RemoteAccess %post -p /sbin/ldconfig