From b93f751bf66c8200e72112e6d7d489e93ac24bd02a03a9c4bb74b4d4427b7cd3 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 11 Oct 2011 14:55:24 +0000 Subject: [PATCH] Accepting request 87224 from KDE:Distro:Factory - Remove patch fix_plasma_startup_error.diff as this causes kaffeine not beeing displayed as an action for audio-cds (bnc#722284) Unfortuanetly I could not find what was the actual cause for that patch. If you think I should only have removed the part for the audio-cd which should not do any harm, as the one for amarok has the same entry, I will this. (forwarded request 87038 from christiantrippe) OBS-URL: https://build.opensuse.org/request/show/87224 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=42 --- fix_plasma_startup_error.diff | 33 --------------------------------- kaffeine.changes | 6 ++++++ kaffeine.spec | 3 --- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 fix_plasma_startup_error.diff diff --git a/fix_plasma_startup_error.diff b/fix_plasma_startup_error.diff deleted file mode 100644 index 4a36bd6..0000000 --- a/fix_plasma_startup_error.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- deviceactions/kaffeine_play_audiocd.desktop -+++ deviceactions/kaffeine_play_audiocd.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Service - Actions=PlayAudioCd; --X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio' -+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'Audio' ] - - [Desktop Action PlayAudioCd] - Name=Play Audio CD with Kaffeine ---- deviceactions/kaffeine_play_dvd.desktop -+++ deviceactions/kaffeine_play_dvd.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Service - Actions=PlayDVD; --X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoDvd' -+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ] - - [Desktop Action PlayDVD] - Name=Play DVD with Kaffeine ---- deviceactions/kaffeine_play_videocd.desktop -+++ deviceactions/kaffeine_play_videocd.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Service - Actions=PlayVideoCd; --X-KDE-Solid-Predicate=[OpticalDisc.availableContent & 'VideoCd' OR OpticalDisc.availableContent & 'SuperVideoCd'] -+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ] - - [Desktop Action PlayVideoCd] - Name=Play Video CD with Kaffeine diff --git a/kaffeine.changes b/kaffeine.changes index e9a8181..eb8ef4c 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 7 10:34:42 UTC 2011 - ctrippe@opensuse.org + +- Remove patch fix_plasma_startup_error.diff as this causes kaffeine + not beeing displayed as an action for audio-cds (bnc#722284) + ------------------------------------------------------------------- Wed Apr 27 20:23:37 UTC 2011 - asterios.dramis@gmail.com diff --git a/kaffeine.spec b/kaffeine.spec index 76a1285..b8e8d9f 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -31,8 +31,6 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-icons.tar.bz2 # PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters) Patch0: kaffeine-fixsplitter.patch -# PATCH-FIX-OPENSUSE fix_plasma_startup_error.diff -- Fix plasma solid actions -Patch1: fix_plasma_startup_error.diff # PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall Patch2: ksuseinstall.diff # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- Add InitialPreference to set it as the default video player @@ -62,7 +60,6 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. %prep %setup -q -b 1 %patch0 -%patch1 %if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps} %patch2 %endif