[kdeplasma-addons] rename youtube krunner icons to avoid conflict with kamoso

Rex Dieter rdieter at fedoraproject.org
Mon Jun 11 15:47:17 UTC 2012


commit 68585d6a7487e7aefa4cf1610182c4f1781c9a97
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 11 10:50:15 2012 -0500

    rename youtube krunner icons to avoid conflict with kamoso

 kdeplasma-addons.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index c147101..f254d91 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,7 +1,7 @@
 Name:    kdeplasma-addons
 Summary: Additional plasmoids for KDE
 Version: 4.8.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
@@ -102,6 +102,15 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 %patch300 -p1 -b .webkit
 %endif
 
+# rename some icons that conflict with kamoso
+pushd runners/youtube
+sed -i.bak -e 's|^Icon=youtube|Icon=runner_youtube|' *.desktop
+for icon in icons/*-action-youtube.* ; do
+  new_name=$(echo ${icon} | sed -e's|-youtube|-runner_youtube|')
+  mv ${icon} ${new_name}
+done
+popd
+
 %build
 
 mkdir -p %{_target_platform}
@@ -365,7 +374,7 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/plasma_comicprovider.desktop
 %{_kde4_datadir}/kde4/servicetypes/plasma_potdprovider.desktop
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
-%{_kde4_iconsdir}/hicolor/*/actions/youtube.*
+%{_kde4_iconsdir}/hicolor/*/actions/*youtube.*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 
 %post libs -p /sbin/ldconfig
@@ -412,6 +421,9 @@ fi
 
 
 %changelog
+* Mon Jun 11 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.90-2
+- rename youtube krunner icons to avoid conflict with kamoso
+
 * Sun Jun 10 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.90-1
 - 4.8.90
 


More information about the scm-commits mailing list