From 0aa473b88d00a7a48c0f9f45e1522092bd16d894 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 14 Mar 2012 13:08:19 +0000 Subject: [PATCH] Give the kde4 protocol files a unique prefix so they don't conflict with other packages. Fixes issue 2804 Also install them in the RPM .spec to fix the Fedora builds --- dist/CMakeLists.txt | 5 ++++- dist/{feed.protocol => clementine-feed.protocol} | 0 dist/{itms.protocol => clementine-itms.protocol} | 0 dist/{itpc.protocol => clementine-itpc.protocol} | 0 dist/{zune.protocol => clementine-zune.protocol} | 0 dist/clementine.spec.in | 6 +++++- 6 files changed, 9 insertions(+), 2 deletions(-) rename dist/{feed.protocol => clementine-feed.protocol} (100%) rename dist/{itms.protocol => clementine-itms.protocol} (100%) rename dist/{itpc.protocol => clementine-itpc.protocol} (100%) rename dist/{zune.protocol => clementine-zune.protocol} (100%) diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index 8c76dc64b..17120fafb 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -40,7 +40,10 @@ if (NOT APPLE) DESTINATION share/applications ) - install(FILES itms.protocol itpc.protocol feed.protocol zune.protocol + install(FILES clementine-itms.protocol + clementine-itpc.protocol + clementine-feed.protocol + clementine-zune.protocol DESTINATION share/kde4/services ) diff --git a/dist/feed.protocol b/dist/clementine-feed.protocol similarity index 100% rename from dist/feed.protocol rename to dist/clementine-feed.protocol diff --git a/dist/itms.protocol b/dist/clementine-itms.protocol similarity index 100% rename from dist/itms.protocol rename to dist/clementine-itms.protocol diff --git a/dist/itpc.protocol b/dist/clementine-itpc.protocol similarity index 100% rename from dist/itpc.protocol rename to dist/clementine-itpc.protocol diff --git a/dist/zune.protocol b/dist/clementine-zune.protocol similarity index 100% rename from dist/zune.protocol rename to dist/clementine-zune.protocol diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in index 7aa0ea693..dedeff164 100644 --- a/dist/clementine.spec.in +++ b/dist/clementine.spec.in @@ -79,9 +79,13 @@ make clean %{_bindir}/clementine %{_bindir}/clementine-tagreader %{_datadir}/applications/clementine.desktop +%{_datadir}/clementine/projectm-presets +%{_datadir}/kde4/services/clementine-itms.protocol +%{_datadir}/kde4/services/clementine-itpc.protocol +%{_datadir}/kde4/services/clementine-feed.protocol +%{_datadir}/kde4/services/clementine-zune.protocol %{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png %{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg -%{_datadir}/clementine/projectm-presets %changelog * @RPM_DATE@ David Sansome - @CLEMENTINE_VERSION_RPM_V@