rpms/kplayer/F-20 kplayer-docdir.patch, NONE, 1.1 kplayer-desktop-fix.patch, 1.1, 1.2 kplayer.spec, 1.13, 1.14

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/kplayer/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18793

Modified Files:
	kplayer-desktop-fix.patch kplayer.spec 
Added Files:
	kplayer-docdir.patch 
Log Message:
* Sat Jan 11 2014 Rex Dieter <rdieter at fedoraproject.org> 1:0.7.0-10.20081211cvs
- respin desktop-fix.patch so kbuildsycoca4 is happy too
- docdir.patch
- .spec cleanup


kplayer-docdir.patch:
 da/CMakeLists.txt |    2 +-
 en/CMakeLists.txt |    2 +-
 es/CMakeLists.txt |    2 +-
 it/CMakeLists.txt |    2 +-
 pt/CMakeLists.txt |    2 +-
 sv/CMakeLists.txt |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kplayer-docdir.patch ---
diff -up kplayer/doc/da/CMakeLists.txt.docdir kplayer/doc/da/CMakeLists.txt
--- kplayer/doc/da/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/da/CMakeLists.txt	2014-01-11 13:45:42.227980534 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/da SUBDIR kplayer )
diff -up kplayer/doc/en/CMakeLists.txt.docdir kplayer/doc/en/CMakeLists.txt
--- kplayer/doc/en/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/en/CMakeLists.txt	2014-01-11 13:45:49.717910628 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kplayer )
diff -up kplayer/doc/es/CMakeLists.txt.docdir kplayer/doc/es/CMakeLists.txt
--- kplayer/doc/es/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/es/CMakeLists.txt	2014-01-11 13:45:56.159850460 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/es SUBDIR kplayer )
diff -up kplayer/doc/it/CMakeLists.txt.docdir kplayer/doc/it/CMakeLists.txt
--- kplayer/doc/it/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/it/CMakeLists.txt	2014-01-11 13:46:00.887806301 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it SUBDIR kplayer )
diff -up kplayer/doc/pt/CMakeLists.txt.docdir kplayer/doc/pt/CMakeLists.txt
--- kplayer/doc/pt/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/pt/CMakeLists.txt	2014-01-11 13:46:05.472763478 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt SUBDIR kplayer )
diff -up kplayer/doc/sv/CMakeLists.txt.docdir kplayer/doc/sv/CMakeLists.txt
--- kplayer/doc/sv/CMakeLists.txt.docdir	2008-01-11 12:24:07.000000000 -0600
+++ kplayer/doc/sv/CMakeLists.txt	2014-01-11 13:46:11.402708094 -0600
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv SUBDIR kplayer )

kplayer-desktop-fix.patch:
 kplayer-actions.desktop    |    2 +-
 kplayer-directory.desktop  |    2 +-
 kplayer-next.desktop       |    2 +-
 kplayer-play-queue.desktop |    2 +-
 kplayer.desktop            |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

Index: kplayer-desktop-fix.patch
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-20/kplayer-desktop-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kplayer-desktop-fix.patch	15 Aug 2010 05:38:57 -0000	1.1
+++ kplayer-desktop-fix.patch	11 Jan 2014 19:54:25 -0000	1.2
@@ -1,75 +1,63 @@
---- kplayer.old/kplayer/kplayer.desktop	2007-12-11 13:33:11.000000000 -0500
-+++ kplayer/kplayer/kplayer.desktop	2010-08-15 01:17:48.000000000 -0400
-@@ -1,64 +1,8 @@
+diff -up kplayer/kplayer/kplayer-actions.desktop.fixdesktop kplayer/kplayer/kplayer-actions.desktop
+--- kplayer/kplayer/kplayer-actions.desktop.fixdesktop	2007-12-11 12:33:11.000000000 -0600
++++ kplayer/kplayer/kplayer-actions.desktop	2014-01-11 13:28:26.272664837 -0600
+@@ -1,6 +1,6 @@
  [Desktop Entry]
--Encoding=UTF-8
+ ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio
 n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory
+-Actions=AddToNewPlaylist
++Actions=AddToNewPlaylist;
+ Encoding=UTF-8
+ Type=Service
+ 
+diff -up kplayer/kplayer/kplayer.desktop.fixdesktop kplayer/kplayer/kplayer.desktop
+--- kplayer/kplayer/kplayer.desktop.fixdesktop	2007-12-11 12:33:11.000000000 -0600
++++ kplayer/kplayer/kplayer.desktop	2014-01-11 13:31:22.626014867 -0600
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
  Type=Application
  Exec=kplayer -- %U
 -Icon=kplayer.png
 +Icon=kplayer
  DocPath=kplayer/index.html
--Comment=Media Player
--Comment[af]=Media Speler
--Comment[ar]=قارئ الوسائط
--Comment[be]=Медыяпрайгравальнік
--Comment[bg]=Медия плеър
--Comment[br]=Soner liesvedia
--Comment[ca]=Reproductor multimèdia
--Comment[cs]=Přehrávač médií
--Comment[cy]=Chwaraeydd Cyfryngau
--Comment[da]=Medieafspiller
--Comment[de]=Medienwiedergabe
--Comment[el]=Αναπαραγωγή πολυμέσων
--Comment[eo]=Ludilo por sonor-dosieroj
--Comment[es]=Reproductor multimedia
--Comment[et]=Meediamängija
--Comment[eu]=Media Jolea
--Comment[fi]=Mediasoitin
--Comment[fr]=Lecteur multimédia
--Comment[ga]=Seinnteoir Meán
--Comment[gl]=Reprodutor Multimédia
--Comment[he]=× ×’×Ÿ מדיה
--Comment[hi]=मीडिया प्लेयर
--Comment[hu]=Médialejátszó
--Comment[it]=Lettore multimediale
--Comment[ja]=メディアプレーヤ
--Comment[ka]=მედიადამკვრელი
--Comment[lt]=DaugialypÄ—s terpÄ—s grotuvas
--Comment[lv]=Mēdiju Atskaņotājs
--Comment[mk]=Изведувач на мултимедиа
--Comment[nb]=Mediaspiller
--Comment[nl]=Mediaspeler
--Comment[nn]=Mediespelar
--Comment[pa]=ਮੀਡਿਆ ਪਲੇਅਰ
--Comment[pl]=Odtwarzacz multimedialny
--Comment[pt]=Leitor multimédia
--Comment[pt_BR]=Reprodutor de mídia
--Comment[ro]=Program de redare multimedia
--Comment[ru]=Медиаплеер
--Comment[se]=Mediačuojaheaddji
--Comment[sk]=Prehrávač médií
--Comment[sl]=Večpredstavnostni predvajalnik
--Comment[sr]=Медија плејер
--Comment[sr at Latn]=Medija plejer
--Comment[sv]=Mediaspelare
--Comment[ta]=ஊடக ப்ளேயர்
--Comment[th]=เครื่องเล่นแฟ้มสื่อ
--Comment[tr]=Medya Oynatıcı
--Comment[uk]=Програвач мультимедії
--Comment[uz]=Медиа плейер
--Comment[ven]=Tshitambi tsha Media
--Comment[xh]=Umdlali we Midia
--Comment[xx]=xxMedia Playerxx
--Comment[zh_CN]=媒体播放器
--Comment[zh_TW]=多媒體播放器
--Comment[zu]=Umdlali Wezezindaba
- Terminal=false
- Name=KPlayer
- GenericName=Media Player
-@@ -116,5 +60,5 @@ GenericName[xx]=xxMedia Playerxx
+ Comment=Media Player
+ Comment[af]=Media Speler
+@@ -116,5 +116,5 @@ GenericName[xx]=xxMedia Playerxx
  GenericName[zh_CN]=媒体播放器
  GenericName[zh_TW]=多媒體播放器
  GenericName[zu]=Umdlali Wezezindaba
 -MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic
 ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu;
 +MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic
 ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;
  Categories=AudioVideo;Player;Qt;KDE;
+diff -up kplayer/kplayer/kplayer-directory.desktop.fixdesktop kplayer/kplayer/kplayer-directory.desktop
+--- kplayer/kplayer/kplayer-directory.desktop.fixdesktop	2007-12-11 12:33:11.000000000 -0600
++++ kplayer/kplayer/kplayer-directory.desktop	2014-01-11 13:26:42.519635833 -0600
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ ServiceTypes=KonqPopupMenu/Plugin,inode/directory
+-Actions=AddToPlaylists;AddToCollection
++Actions=AddToPlaylists;AddToCollection;
+ Encoding=UTF-8
+ Type=Service
+ 
+diff -up kplayer/kplayer/kplayer-next.desktop.fixdesktop kplayer/kplayer/kplayer-next.desktop
+--- kplayer/kplayer/kplayer-next.desktop.fixdesktop	2007-12-11 12:33:11.000000000 -0600
++++ kplayer/kplayer/kplayer-next.desktop	2014-01-11 13:28:39.143544398 -0600
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio
 n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
+-Actions=PlayNext;QueueNext
++Actions=PlayNext;QueueNext;
+ Encoding=UTF-8
+ Type=Service
+ 
+diff -up kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop kplayer/kplayer/kplayer-play-queue.desktop
+--- kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop	2007-12-11 12:33:11.000000000 -0600
++++ kplayer/kplayer/kplayer-play-queue.desktop	2014-01-11 13:28:59.166357042 -0600
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio
 n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
+-Actions=Play;Queue
++Actions=Play;Queue;
+ X-KDE-Priority=TopLevel
+ Encoding=UTF-8
+ Type=Service


Index: kplayer.spec
===================================================================
RCS file: /cvs/free/rpms/kplayer/F-20/kplayer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kplayer.spec	27 May 2013 19:04:24 -0000	1.13
+++ kplayer.spec	11 Jan 2014 19:54:25 -0000	1.14
@@ -3,9 +3,8 @@
 Name:           kplayer
 Epoch:          1
 Version:        0.7.0
-Release:        9.%cvsversion%{?dist}
+Release:        10.%cvsversion%{?dist}
 Summary:        A media player based on MPlayer
-Group:          Applications/Multimedia
 License:        GPLv3+ and GFDL
 URL:            http://kplayer.sourceforge.net/
 Source0:        %{name}-%{version}-%cvsversion.tar.bz2
@@ -14,11 +13,12 @@
 Patch0:         %{name}-linking.patch
 # Match the .desktop file to freedesktop standards
 Patch1:         %{name}-desktop-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix docdir install path
+Patch2:         %{name}-docdir.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs4-devel
 
 Requires:       mplayer
 #Requires(hint): libdvdcss
@@ -42,47 +42,26 @@
 %setup -q -n %{name}
 %patch0 -p1 -b .linking
 %patch1 -p1 -b .fixdesktop
+%patch2 -p1 -b .docdir
 
-%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON .
+%{cmake_kde4} .
 
 # Fix documentation build
 sed -i 's|V4.1.2|V4.2|' doc/*/index.docbook
 
 %build
-make %{?_smp_mflags} VERBOSE=1 
+make %{?_smp_mflags} 
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} 
+make install/fast DESTDIR=%{buildroot} 
 
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    # Install HTML docs in the correct location and
-    mv $lang_dir $lang_dir.TMP
-    mkdir $lang_dir
-    mv $lang_dir.TMP $lang_dir/%{name}
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{name} --with-kde 
 
 # Install servicemenus in the correct location:
 mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/
-mv %{buildroot}%{_kde4_datadir}/kde4/apps/konqueror/servicemenus/* \
+mv %{buildroot}%{_kde4_appsdir}/konqueror/servicemenus/* \
    %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/
 
 
@@ -90,9 +69,6 @@
 desktop-file-validate \
    %{buildroot}%{_kde4_datadir}/applications/kde4/kplayer.desktop
 
-%clean
-rm -rf %{buildroot}
-
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -109,20 +85,23 @@
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING* README TODO
 %{_kde4_bindir}/%{name}
 %{_kde4_datadir}/applications/kde4/*%{name}.desktop
-%{_kde4_datadir}/kde4/apps/%{name}/
+%{_kde4_appsdir}/%{name}/
 %{_kde4_datadir}/kde4/services/*%{name}*.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/
-%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_datadir}/kde4/services/ServiceMenus/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/lib%{name}part.*
 
 
 %changelog
+* Sat Jan 11 2014 Rex Dieter <rdieter at fedoraproject.org> 1:0.7.0-10.20081211cvs
+- respin desktop-fix.patch so kbuildsycoca4 is happy too
+- docdir.patch
+- .spec cleanup
+
 * Mon May 27 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:0.7.0-9.20081211cvs
 - Rebuilt for x264/FFmpeg