From 85a8ceee9ef6c0a7972d611fce17b476314da4a3dbd41937096c426e47b0409d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Jan 2016 08:29:54 +0000 Subject: [PATCH] Accepting request 351956 from home:christiantrippe:branches:multimedia:libs - Install the solid action desktop files also in /usr/share/solid/actions to make them available in Plasma5 (boo#960621) I am not sure, this is the correct approach. But I did not want to break vlc for KDE4 setups. If you agree with the approach I would like to submit this also as update for Leap. OBS-URL: https://build.opensuse.org/request/show/351956 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=152 --- vlc.changes | 6 ++++++ vlc.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/vlc.changes b/vlc.changes index 7e7ad19..bfce806 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 4 08:50:53 UTC 2016 - ctrippe@opensuse.org + +- Install the solid action desktop files also in /usr/share/solid/actions + to make them available in Plasma5 (boo#960621) + ------------------------------------------------------------------- Mon Dec 28 06:49:35 UTC 2015 - wbauer@tmo.at diff --git a/vlc.spec b/vlc.spec index b9a0093..30f364a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,7 +1,7 @@ # # spec file for package vlc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -474,6 +474,10 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}/%{_datadir}/pixmaps # We need a full copy, as the pixmap icon goes to the -noX package cp %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png +#Make vlc available in Plasma 5 device notifier +mkdir %{buildroot}%{_datadir}/solid +mkdir %{buildroot}%{_datadir}/solid/actions +cp %{buildroot}%{_datadir}/kde4/apps/solid/actions/vlc-open*.desktop %{buildroot}%{_datadir}/solid/actions/ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file vlc AudioVideo Audio Video Player %fdupes %{buildroot}%{_datadir}/vlc @@ -536,6 +540,7 @@ done %dir %{_datadir}/kde4 %dir %{_datadir}/kde4/apps %{_datadir}/kde4/apps/solid +%{_datadir}/solid %exclude %{_libdir}/vlc/libcompat.a %{_mandir}/man1/svlc* %if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}