[kamoso] rename icons to avoid conflict with kdeplasma-addons' krunner plugin
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 11 15:51:51 UTC 2012
commit 48ee9e4be5360bf55b41e34730995a43f013c2b0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jun 11 10:54:49 2012 -0500
rename icons to avoid conflict with kdeplasma-addons' krunner plugin
kamoso.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/kamoso.spec b/kamoso.spec
index d93ed79..061a743 100644
--- a/kamoso.spec
+++ b/kamoso.spec
@@ -1,6 +1,6 @@
Name: kamoso
Version: 2.0.2
-Release: 4%{?pre}%{?dist}
+Release: 5%{?pre}%{?dist}
Summary: Application for taking pictures and videos from a webcam
Group: Applications/Multimedia
@@ -25,6 +25,14 @@ Kamoso is an application to take pictures and videos out of your webcam.
%setup -q
%patch0 -p1
+# rename some icons that conflict with kdeplasma-addons
+pushd src/plugins/youtube
+sed -i.bak -e 's|^Icon=youtube|Icon=kipiplugin_youtube|' *.desktop
+for icon in icons/*-action-youtube.* ; do
+ new_name=$(echo ${icon} | sed -e's|-youtube|-kipiplugin_youtube|')
+ mv ${icon} ${new_name}
+done
+
%build
mkdir -p %{_target_platform}
@@ -69,7 +77,7 @@ rm -rf %{buildroot}
%{_kde4_bindir}/kamosoPluginTester
%{_kde4_libdir}/kde4/kipiplugin_youtube.so
%{_kde4_iconsdir}/hicolor/*/apps/%{name}.*
-%{_kde4_iconsdir}/hicolor/*/actions/youtube.*
+%{_kde4_iconsdir}/hicolor/*/actions/*youtube.*
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_datadir}/kde4/services/kipiplugin_youtube.desktop
%{_kde4_datadir}/kde4/servicetypes/kamosoplugin.desktop
@@ -77,6 +85,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jun 11 2012 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
+- rename icons to avoid conflict with kdeplasma-addons' krunner plugin
+
* Tue May 29 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.0.2-4
- fix build against libkipi-4.8.80
More information about the scm-commits
mailing list