From da07edb8ab401be516661f3558baf4dfc29ba1671127af8ae944421910ba4d56 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Jun 2009 22:11:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=19 --- desktop-files.diff | 10 ---------- fix_plasma_startup_error.diff | 33 +++++++++++++++++++++++++++++++++ kaffeine-icons.tar.bz2 | 3 +++ kaffeine.changes | 6 ++++++ kaffeine.spec | 13 +++++++++---- 5 files changed, 51 insertions(+), 14 deletions(-) delete mode 100644 desktop-files.diff create mode 100644 fix_plasma_startup_error.diff create mode 100644 kaffeine-icons.tar.bz2 diff --git a/desktop-files.diff b/desktop-files.diff deleted file mode 100644 index e6dd3b2..0000000 --- a/desktop-files.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/kaffeine.desktop 2009/04/28 06:18:54 1.1 -+++ src/kaffeine.desktop 2009/04/28 06:23:47 -@@ -45,7 +45,6 @@ - GenericName[x-test]=xxMedia Playerxx - GenericName[zh_CN]=媒体播放器 - Categories=Qt;KDE;AudioVideo;Player; --Icon=kaffeine - MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-mplayer2;application/x-quicktime-media-link;application/x-shorten;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg; - Terminal=false - Type=Application diff --git a/fix_plasma_startup_error.diff b/fix_plasma_startup_error.diff new file mode 100644 index 0000000..ac1b356 --- /dev/null +++ b/fix_plasma_startup_error.diff @@ -0,0 +1,33 @@ +--- 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|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-icons.tar.bz2 b/kaffeine-icons.tar.bz2 new file mode 100644 index 0000000..c4ed1e1 --- /dev/null +++ b/kaffeine-icons.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acc1301c7f4d3943710f2bc5beb931a2562e4d203ff8abc56f77b357278c4e13 +size 26292 diff --git a/kaffeine.changes b/kaffeine.changes index 2bec577..10a42a5 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 3 16:14:59 CEST 2009 - beineri@opensuse.org + +- copy application icon from oxygen trunk to fix start menu icon + on every other/older KDE (bnc#509210) + ------------------------------------------------------------------- Tue Apr 28 08:32:10 CEST 2009 - beineri@opensuse.org diff --git a/kaffeine.spec b/kaffeine.spec index b7ae070..f6a6269 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -25,10 +25,11 @@ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.9+1.0pre1 -Release: 1 +Release: 2 # http://kaffeine.kde.org/?q=node/22 Source0: kaffeine.tar.bz2 -Patch: desktop-files.diff +Source1: kaffeine-icons.tar.bz2 +Patch1: fix_plasma_startup_error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Provides: kde4-kaffeine = 4.2.2.svn951439 @@ -46,8 +47,8 @@ Authors: Jürgen Kofler %prep -%setup -q -n kaffeine -%patch +%setup -q -n kaffeine -b 1 +%patch1 %build %cmake_kde4 -d build @@ -74,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/kaffeine %_kde_share_dir/apps/kaffeine /usr/share/applications/kde4/kaffeine.desktop +/usr/share/icons/hicolor/*/apps/kaffeine.* %dir %_kde_share_dir/apps/solid %dir %_kde_share_dir/apps/solid/actions %_kde_share_dir/apps/solid/actions/kaffeine_play_audiocd.desktop @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icons/oxygen/*/actions/video-television-encrypted.* %changelog +* Wed Jun 03 2009 beineri@opensuse.org +- copy application icon from oxygen trunk to fix start menu icon + on every other/older KDE (bnc#509210) * Tue Apr 28 2009 beineri@opensuse.org - fix build * Mon Apr 27 2009 tittiatcoke@gmail.com