rpms/kmplayer/F-11 kmplayer-no-xtest.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kmplayer.spec, 1.14, 1.15 sources, 1.6, 1.7 kmplayer-0.11.1b-no-xtest.patch, 1.1, NONE

Fri Mar 5 10:34:07 UTC 2010

Author: oget

Update of /cvs/pkgs/rpms/kmplayer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7858

Modified Files:
	.cvsignore kmplayer.spec sources 
Added Files:
	kmplayer-no-xtest.patch 
Removed Files:
	kmplayer-0.11.1b-no-xtest.patch 
Log Message:
* Fri Mar 05 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.2-1
- kmplayer-0.11.2
- Drop upstreamed dso linking patch


kmplayer-no-xtest.patch:
 po/CMakeLists.txt         |    1 -
 src/kmplayer.desktop      |    3 ---
 src/kmplayer_part.desktop |    2 --
 3 files changed, 6 deletions(-)

--- NEW FILE kmplayer-no-xtest.patch ---
diff -rupN kmplayer-0.11.2.old/po/CMakeLists.txt kmplayer-0.11.2/po/CMakeLists.txt
--- kmplayer-0.11.2.old/po/CMakeLists.txt	2010-03-04 13:33:08.000000000 -0500
+++ kmplayer-0.11.2/po/CMakeLists.txt	2010-03-05 04:42:49.000000000 -0500
@@ -35,6 +35,5 @@ add_subdirectory(sk)
 add_subdirectory(sv)
 add_subdirectory(tr)
 add_subdirectory(uk)
-add_subdirectory(x-test)
 add_subdirectory(zh_CN)
 add_subdirectory(zh_TW)
diff -rupN kmplayer-0.11.2.old/src/kmplayer.desktop kmplayer-0.11.2/src/kmplayer.desktop
--- kmplayer-0.11.2.old/src/kmplayer.desktop	2010-03-04 13:33:08.000000000 -0500
+++ kmplayer-0.11.2/src/kmplayer.desktop	2010-03-05 04:43:38.000000000 -0500
@@ -38,7 +38,6 @@ Comment[sv]=KDE-gränssnitt för Mplayer
 Comment[th]=ระบบติดต่อผู้ใช้ของ MPlayer บน KDE 
 Comment[tr]=MPlayer için KDE arayüzü
 Comment[uk]=KDE-інтерфейс для MPlayer
-Comment[x-test]=xxKDE interface for MPlayerxx
 Comment[zh_CN]=MPlayer 的 KDE 界面
 Terminal=false
 Name=KMPlayer
@@ -78,7 +77,6 @@ Name[sv]=Kmplayer
 Name[th]=KMPlayer
 Name[tr]=KMPlayer
 Name[uk]=KMPlayer
-Name[x-test]=xxKMPlayerxx
 Name[zh_CN]=KMPlayer
 Name[zh_TW]=KMPlayer
 MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/flv;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-flv;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
@@ -121,6 +119,5 @@ GenericName[sv]=Mediaspelare
 GenericName[th]=โปรแกรมเล่นสื่อ
 GenericName[tr]=Medya Oynatıcı
 GenericName[uk]=Програвач
-GenericName[x-test]=xxMedia Playerxx
 GenericName[zh_CN]=媒体播放器
 GenericName[zh_TW]=媒體播放器
diff -rupN kmplayer-0.11.2.old/src/kmplayer_part.desktop kmplayer-0.11.2/src/kmplayer_part.desktop
--- kmplayer-0.11.2.old/src/kmplayer_part.desktop	2010-03-04 13:33:08.000000000 -0500
+++ kmplayer-0.11.2/src/kmplayer_part.desktop	2010-03-05 04:44:01.000000000 -0500
@@ -35,7 +35,6 @@ Name[sv]=Inbäddad Mplayer för KDE
 Name[th]=ตัวเล่นสื่อ MPlayer แบบฝังตัวได้สำหรับ KDE
 Name[tr]=KDE için gömülmüş MPlayer
 Name[uk]=Вбудований MPlayer для KDE
-Name[x-test]=xxEmbedded MPlayer for KDExx
 Name[zh_CN]=KDE 嵌入式 MPlayer
 Comment=Video player plugin (QuickTime, XMovie, Windows Media and RealPlayer compatible)
 Comment[be]=Утулка прайгравання відэа (сумяшчальны з QuickTime, XMovie, Windows Media і RealPlayer)
@@ -71,7 +70,6 @@ Comment[sv]=Insticksprogram för videosp
 Comment[th]=ส่วนเสริมตัวเล่นวิดีโอ (ใช้ด้วยกันได้กับ QuickTime, XMovie, Windows Media และ RealPlayer)
 Comment[tr]=Video oynatıcı eklentisi (QuickTime, XMovie, Windows Media ve RealPlayer ile uyumlu)
 Comment[uk]=Додаток відтворення відео (QuickTime, XMovie, Windows Media і сумісних з RealPlayer)
-Comment[x-test]=xxVideo player plugin (QuickTime, XMovie, Windows Media and RealPlayer compatible)xx
 Comment[zh_CN]=视频播放器插件(兼容 QuickTime、XMovie、Windows Media 和 RealPlayer)
 X-KDE-Library=libkmplayerpart
 # Keep in sync with the audio types in kmplayer.desktop


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Jun 2009 23:00:52 -0000	1.6
+++ .cvsignore	5 Mar 2010 10:34:06 -0000	1.7
@@ -1 +1 @@
-kmplayer-0.11.1b.tar.bz2
+kmplayer-0.11.2.tar.bz2


Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/F-11/kmplayer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kmplayer.spec	17 Jun 2009 23:00:53 -0000	1.14
+++ kmplayer.spec	5 Mar 2010 10:34:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:    kmplayer
 Summary: A simple frontend for MPlayer/FFMpeg/Phonon
-Version: 0.11.1b
+Version: 0.11.2
 Release: 1%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
@@ -17,9 +17,8 @@ License: GFDL and GPLv2+
 URL:     http://kmplayer.kde.org/
 Source0: http://kmplayer.kde.org/pkgs/kmplayer-%{version}%{?beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # We don't want this weird invalid locale:
-Patch2: kmplayer-0.11.1b-no-xtest.patch
+Patch2: kmplayer-no-xtest.patch
 # default to using phonon (instead of mplayer)
 Patch4: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
 
@@ -45,7 +44,6 @@ on a movie file, the movie is played ins
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
-
 %patch2 -p1 -b .no-x-text
 %patch4 -p1 -b .kmplayerrc_phonon_default
 
@@ -91,9 +89,11 @@ fi
 # oxygen conflicts
 rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/kmplayer.*
 
-
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmplayer.desktop
+# Desktop file
+desktop-file-install \
+   --dir=%{buildroot}/%{_kde4_datadir}/applications/kde4 \
+   --add-category="Player" \
+   %{buildroot}/%{_kde4_datadir}/applications/kde4/kmplayer.desktop
 
 
 %clean
@@ -132,6 +132,19 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Mar 05 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.2-1
+- kmplayer-0.11.2
+- Drop upstreamed dso linking patch
+
+* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-4
+- Fix DSO linking RHBZ#564937
+
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-3
+- Update the .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-1
 - kmplayer-0.11.1b
 - drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Jun 2009 23:00:53 -0000	1.6
+++ sources	5 Mar 2010 10:34:06 -0000	1.7
@@ -1 +1 @@
-a6b2c9dd8650e36cd6521d152bb5d9c9  kmplayer-0.11.1b.tar.bz2
+ff47bee19df493ffb690df18dcba6e19  kmplayer-0.11.2.tar.bz2


--- kmplayer-0.11.1b-no-xtest.patch DELETED ---

