rpms/kplayer/devel kplayer-desktop-fix.patch, NONE, 1.1 kplayer-linking.patch, NONE, 1.1 kplayer.spec, 1.5, 1.6

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/kplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12502

Modified Files:
	kplayer.spec 
Added Files:
	kplayer-desktop-fix.patch kplayer-linking.patch 
Log Message:
* Sun Aug 15 2010 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-3.20081211cvs
- Fix mimetypes in the .desktop file (RFBZ#1195)
- Switch to modern scriptlets
- Use kde4 macros
- Fix DSO linking


kplayer-desktop-fix.patch:
 kplayer.desktop |   60 +-------------------------------------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

--- NEW FILE kplayer-desktop-fix.patch ---
--- 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 @@
 [Desktop Entry]
-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
 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;applica
 tion/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;applica
 tion/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;

kplayer-linking.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kplayer-linking.patch ---
diff -rupN kplayer.old/kplayer/CMakeLists.txt kplayer/kplayer/CMakeLists.txt
--- kplayer.old/kplayer/CMakeLists.txt	2008-08-03 20:10:13.000000000 -0400
+++ kplayer/kplayer/CMakeLists.txt	2010-08-15 01:06:50.000000000 -0400
@@ -55,7 +55,7 @@ set(kplayer_SRCS ${kplayer_SRCS}
 
 kde4_add_executable(kplayer ${kplayer_SRCS})
 
-target_link_libraries(kplayer ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kplayer ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} solid)
 
 install(TARGETS kplayer DESTINATION ${BIN_INSTALL_DIR})
 


Index: kplayer.spec
===================================================================
RCS file: /cvs/free/rpms/kplayer/devel/kplayer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kplayer.spec	29 Mar 2009 13:20:27 -0000	1.5
+++ kplayer.spec	15 Aug 2010 05:38:57 -0000	1.6
@@ -3,13 +3,17 @@
 Name:           kplayer
 Epoch:          1
 Version:        0.7.0
-Release:        2.%cvsversion%{?dist}
+Release:        3.%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
 Source1:        %{name}-snapshot.sh
+# Fix DSO linking
+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)
 
 BuildRequires:  desktop-file-utils
@@ -36,6 +40,8 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .linking
+%patch1 -p1 -b .fixdesktop
 
 %{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON .
 
@@ -73,48 +79,54 @@
 fi
 
 # Install servicemenus in the correct location:
-mkdir -p %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
-mv %{buildroot}%{_datadir}/kde4/apps/konqueror/servicemenus/* \
-   %{buildroot}%{_datadir}/kde4/services/ServiceMenus/
+mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/
+mv %{buildroot}%{_kde4_datadir}/kde4/apps/konqueror/servicemenus/* \
+   %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/*.desktop ||:
-
+desktop-file-validate \
+   %{buildroot}%{_kde4_datadir}/applications/kde4/kplayer.desktop
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-fi
-update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+update-desktop-database &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING* README TODO
-%{_bindir}/%{name}
-%{_datadir}/applications/kde4/*%{name}.desktop
-%{_datadir}/kde4/apps/%{name}/
-%{_datadir}/kde4/services/*%{name}*.desktop
-%{_datadir}/kde4/services/ServiceMenus/
-%{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/kde4/lib%{name}part.*
+%{_kde4_bindir}/%{name}
+%{_kde4_datadir}/applications/kde4/*%{name}.desktop
+%{_kde4_datadir}/kde4/apps/%{name}/
+%{_kde4_datadir}/kde4/services/*%{name}*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_libdir}/kde4/lib%{name}part.*
 
 
 %changelog
+* Sun Aug 15 2010 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-3.20081211cvs
+- Fix mimetypes in the .desktop file (RFBZ#1195)
+- Switch to modern scriptlets
+- Use kde4 macros
+- Fix DSO linking
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.7.0-2.20081211cvs
 - rebuild for new F11 features