From 853fadfedf39374378bf19f3484f05ac9ff9b7d64887108281e4ffbb79573c5b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 27 Jun 2016 21:12:18 +0000 Subject: [PATCH] Accepting request 405070 from home:favogt:branches:KDE:Applications Fix copying of icons from oxygen OBS-URL: https://build.opensuse.org/request/show/405070 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=33 --- ksystemlog.changes | 5 +++++ ksystemlog.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ksystemlog.changes b/ksystemlog.changes index 55b5ea7..f04110b 100644 --- a/ksystemlog.changes +++ b/ksystemlog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 27 19:30:28 UTC 2016 - fvogt@suse.com + +- Fix copying of icons from oxygen + ------------------------------------------------------------------- Fri Jun 10 18:06:09 UTC 2016 - tittiatcoke@gmail.com diff --git a/ksystemlog.spec b/ksystemlog.spec index eea461b..33787fe 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -53,8 +53,9 @@ want to quickly see problems occurring on their server. %kf5_makeinstall -C build %suse_update_desktop_file org.kde.ksystemlog System Monitor for i in {16,22,32,48,64,128}; do - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps - cp /usr/share/icons/oxygen/"$i"x"$i"/apps/utilities-log-viewer.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/; + mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/${i}x${i}/apps + cp /usr/share/icons/oxygen/${i}x${i}/apps/utilities-log-viewer.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/${i}x${i}/apps/ \ + || cp /usr/share/icons/oxygen/base/${i}x${i}/apps/utilities-log-viewer.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/${i}x${i}/apps/ done %post -p /sbin/ldconfig