rpms/kmplayer/F-11 kmplayer-0.11.1b-no-xtest.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kmplayer.spec, 1.13, 1.14 sources, 1.5, 1.6 kmplayer-0.11.0a-fix_docs.patch, 1.1, NONE kmplayer-0.11.0a-no-xtest.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	.cvsignore kmplayer.spec sources 
Added Files:
	kmplayer-0.11.1b-no-xtest.patch 
Removed Files:
	kmplayer-0.11.0a-fix_docs.patch 
	kmplayer-0.11.0a-no-xtest.patch 
Log Message:
* Wed Jun 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-1
- kmplayer-0.11.1b
- drop upstreamed patches


kmplayer-0.11.1b-no-xtest.patch:

--- NEW FILE kmplayer-0.11.1b-no-xtest.patch ---
diff -rupN kmplayer-0.11.1b.old/po/CMakeLists.txt kmplayer-0.11.1b/po/CMakeLists.txt
--- kmplayer-0.11.1b.old/po/CMakeLists.txt	2009-06-17 15:42:47.000000000 -0400
+++ kmplayer-0.11.1b/po/CMakeLists.txt	2009-06-17 18:14:37.000000000 -0400
@@ -35,6 +35,6 @@ 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.1b.old/src/kmplayer.desktop kmplayer-0.11.1b/src/kmplayer.desktop
--- kmplayer-0.11.1b.old/src/kmplayer.desktop	2009-06-17 15:42:47.000000000 -0400
+++ kmplayer-0.11.1b/src/kmplayer.desktop	2009-06-17 18:14:37.000000000 -0400
@@ -35,7 +35,7 @@ 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
@@ -44,7 +44,7 @@ Name[hne]=केएम-प्लेयà¤
 Name[ku]=KMLêdar
 Name[pa]=KM-ਪਲੇਅਰ
 Name[sv]=Kmplayer
-Name[x-test]=xxKMPlayerxx
+
 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;
 InitialPreference=7
 Categories=Qt;KDE;AudioVideo;
@@ -80,6 +80,6 @@ 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.1b.old/src/kmplayer_part.desktop kmplayer-0.11.1b/src/kmplayer_part.desktop
--- kmplayer-0.11.1b.old/src/kmplayer_part.desktop	2009-06-17 15:42:47.000000000 -0400
+++ kmplayer-0.11.1b/src/kmplayer_part.desktop	2009-06-17 18:14:37.000000000 -0400
@@ -32,7 +32,7 @@ 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)
@@ -65,7 +65,7 @@ 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 May 2009 20:10:26 -0000	1.5
+++ .cvsignore	17 Jun 2009 23:00:52 -0000	1.6
@@ -1 +1 @@
-kmplayer-0.11.1a.tar.bz2
+kmplayer-0.11.1b.tar.bz2


Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/F-11/kmplayer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kmplayer.spec	18 May 2009 20:10:26 -0000	1.13
+++ kmplayer.spec	17 Jun 2009 23:00:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name:    kmplayer
 Summary: A simple frontend for MPlayer/FFMpeg/Phonon
-Version: 0.11.1a
+Version: 0.11.1b
 Release: 1%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
@@ -19,11 +19,9 @@ Source0: http://kmplayer.kde.org/pkgs/km
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We don't want this weird invalid locale:
-Patch2: kmplayer-0.11.0a-no-xtest.patch
+Patch2: kmplayer-0.11.1b-no-xtest.patch
 # default to using phonon (instead of mplayer)
 Patch4: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
-# upstreamable , fixes docbook install
-Patch5: kmplayer-0.11.0a-fix_docs.patch 
 
 
 BuildRequires: cairo-devel
@@ -50,7 +48,6 @@ on a movie file, the movie is played ins
 
 %patch2 -p1 -b .no-x-text
 %patch4 -p1 -b .kmplayerrc_phonon_default
-%patch5 -p1 -b .fix_docs
 
 
 %build
@@ -135,6 +132,10 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Jun 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-1
+- kmplayer-0.11.1b
+- drop upstreamed patches
+
 * Mon May 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1a-1
 - kmplayer-0.11.1a
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 May 2009 20:10:26 -0000	1.5
+++ sources	17 Jun 2009 23:00:53 -0000	1.6
@@ -1 +1 @@
-a701515c8071caad12a18adf21548125  kmplayer-0.11.1a.tar.bz2
+a6b2c9dd8650e36cd6521d152bb5d9c9  kmplayer-0.11.1b.tar.bz2


--- kmplayer-0.11.0a-fix_docs.patch DELETED ---


--- kmplayer-0.11.0a-no-xtest.patch DELETED ---