Accepting request 61530 from KDE:Distro:Factory

Accepted submit request 61530 from user rwooninck

OBS-URL: https://build.opensuse.org/request/show/61530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=38

kaffeine.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 15 20:57:16 UTC 2011 - ctrippe@gmx.net
+
+- Add support for more mimetypes (bnc#671581)
+
+-------------------------------------------------------------------
+Tue Feb  8 20:15:43 UTC 2011 - ctrippe@gmx.net
+
+- Require libqt4-sql-sqlite (bnc#669793)
+
 -------------------------------------------------------------------
 Mon Jan 31 20:52:54 UTC 2011 - asterios.dramis@gmail.com
 

kaffeine.spec

@@ -26,6 +26,9 @@ Summary:        Xine-Based Multimedia Player
 License:        GPLv2+
 Url:            http://kaffeine.kde.org/
 Group:          Productivity/Multimedia/Video/Players
+
+Requires:       libqt4-sql-sqlite
+
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-icons.tar.bz2
 Patch1:         kaffeine-fixsplitter.patch
@@ -36,6 +39,8 @@ Patch3:         ksuseinstall.diff
 Patch4:         initial-preference.diff
 # PATCH-FIX-OPENSUSE build-fix.diff -- Build fix for old qt versions
 Patch5:         build-fix.diff
+# PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff ctrippe@gmx.net -- Support audio/webm and video/x-theora+ogg
+Patch6:         support_mimetypes_bnc671581.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  libkde4-devel
@@ -64,6 +69,9 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
 %if 0%{?kde_updatedapps}
 %patch5 -p0
 %endif
+%if 0%{?suse_version} > 1130
+%patch6
+%endif
 
 %build
 %cmake_kde4 -d build

support_mimetypes_bnc671581.diff

@@ -0,0 +1,11 @@
+--- src/kaffeine.desktop	2010-09-01 21:53:54.000000000 +0200
++++ src/kaffeine.desktop_patched	2011-02-15 21:51:59.000000000 +0100
+@@ -103,7 +103,7 @@
+ GenericName[zh_CN]=媒体播放器
+ Categories=Qt;KDE;AudioVideo;Player;
+ Icon=kaffeine
+-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;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-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;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;
++MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;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-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;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;video/x-theora+ogg;audio/webm;
+ Terminal=false
+ Type=Application
+ X-KDE-HasTempFileOption=true