rpms/kmplayer/devel kmplayer-0.11.0a-icon.patch, NONE, 1.1 kmplayer-0.11.0a-no-xtest.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kmplayer.spec, 1.6, 1.7 sources, 1.2, 1.3 kmplayer-0.10.0c-icon.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/kmplayer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18964

Modified Files:
	.cvsignore kmplayer.spec sources 
Added Files:
	kmplayer-0.11.0a-icon.patch kmplayer-0.11.0a-no-xtest.patch 
Removed Files:
	kmplayer-0.10.0c-icon.patch 
Log Message:
* Tue Mar 24 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.0a-1
- kmplayer-0.11.0a (KDE4)


kmplayer-0.11.0a-icon.patch:

--- NEW FILE kmplayer-0.11.0a-icon.patch ---
diff -up kmplayer-0.10.0c/src/kmplayer.desktop.icon kmplayer-0.10.0c/src/kmplayer.desktop
--- kmplayer-0.10.0c/src/kmplayer.desktop.icon	2008-01-08 11:46:31.000000000 -0600
+++ kmplayer-0.10.0c/src/kmplayer.desktop	2008-01-08 11:46:55.000000000 -0600
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Type=Application
 Exec=kmplayer -caption "%c" %i %m %U
-Icon=kmplayer.png
+Icon=kmplayer
 DocPath=kmplayer/index.html
 Comment=KDE interface for MPlayer
 Comment[be]=KDE інтэрфейс да MPlayer

kmplayer-0.11.0a-no-xtest.patch:

--- NEW FILE kmplayer-0.11.0a-no-xtest.patch ---
diff -rupN kmplayer-0.11.0a.old/po/CMakeLists.txt kmplayer-0.11.0a/po/CMakeLists.txt
--- kmplayer-0.11.0a.old/po/CMakeLists.txt	2009-01-25 14:57:46.000000000 -0500
+++ kmplayer-0.11.0a/po/CMakeLists.txt	2009-03-24 13:04:20.000000000 -0400
@@ -25,5 +25,5 @@ add_subdirectory(ru)
 add_subdirectory(sv)
 add_subdirectory(tr)
 add_subdirectory(uk)
-add_subdirectory(x-test)
+
 add_subdirectory(zh_CN)
diff -rupN kmplayer-0.11.0a.old/src/kmplayer.desktop kmplayer-0.11.0a/src/kmplayer.desktop
--- kmplayer-0.11.0a.old/src/kmplayer.desktop	2009-03-24 13:02:26.000000000 -0400
+++ kmplayer-0.11.0a/src/kmplayer.desktop	2009-03-24 13:05:27.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
@@ -43,7 +43,7 @@ Name[hi]=केएम-प्लेयर
 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;
@@ -77,5 +77,5 @@ GenericName[sv]=Mediaspelare
 GenericName[th]=โปรแกรมเล่นสื่อ
 GenericName[tr]=Medya Oynatıcı
 GenericName[uk]=Програвач
-GenericName[x-test]=xxMedia Playerxx
+
 GenericName[zh_CN]=媒体播放器
diff -rupN kmplayer-0.11.0a.old/src/kmplayer_part.desktop kmplayer-0.11.0a/src/kmplayer_part.desktop
--- kmplayer-0.11.0a.old/src/kmplayer_part.desktop	2009-01-25 14:57:46.000000000 -0500
+++ kmplayer-0.11.0a/src/kmplayer_part.desktop	2009-03-24 13:06:10.000000000 -0400
@@ -30,7 +30,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)
@@ -62,7 +62,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/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jan 2008 17:23:03 -0000	1.2
+++ .cvsignore	24 Mar 2009 18:07:33 -0000	1.3
@@ -1 +1 @@
-kmplayer-0.10.0c.tar.bz2
+kmplayer-0.11.0a.tar.bz2


Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/devel/kmplayer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmplayer.spec	25 Feb 2009 11:37:37 -0000	1.6
+++ kmplayer.spec	24 Mar 2009 18:07:33 -0000	1.7
@@ -1,81 +1,66 @@
-
-# distro/release specific support (using Fedora Extras' style macros)
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_gstreamer --with-gstreamer
-BuildRequires: libXv-devel
-%endif
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-%define _enable_cairo --enable-cairo
-%define _enable_npplayer --enable-npplayer
-%endif
-
 Name:    kmplayer
-Summary: Video plugin for Konqueror and basic Gstreamer/Xine frontend 
-Version: 0.10.0c
-Release: 5%{?dist}
+Summary: Video plugin for Konqueror and basic Xine frontend 
+Version: 0.11.0a
+Release: 1%{?dist}
 Group:   Applications/Multimedia
-
-License: GPLv2+
+# The documentation is GFDL.
+# The files under src/moz-sdk are MPLv1.1 or GPLv2+ or LGPLv2+
+# except src/moz-sdk/npruntime.h is BSD.
+# The other source files carry GPL and LGPL licenses
+# For instance:
+# src/kmplayer.h is GPLv2+
+# src/kmplayer_asx.cpp is LGPLv2
+# src/kmplayer_atom.h is LGPLv2+
+# and each of the other source files carry one of the above 3 licenses. So
+License: GFDL and (MPLv1.1 or GPLv2+ or LGPLv2+) and BSD and GPLv2+ and LGPLv2 and LGPLv2+
 URL:     http://kmplayer.kde.org/
 Source0: http://kmplayer.kde.org/pkgs/kmplayer-%{version}%{?beta}.tar.bz2
+# To match the freedesktop standards:
+Patch1:  kmplayer-0.11.0a-icon.patch
+# We don't want this weird invalid locale:
+Patch2:  kmplayer-0.11.0a-no-xtest.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch1: kmplayer-0.10.0c-icon.patch
-
-%{?_enable_cairo:BuildRequires: cairo-devel}
+BuildRequires: cairo-devel
+BuildRequires: pango-devel
 BuildRequires: desktop-file-utils
 BuildRequires: expat-devel
 BuildRequires: gettext
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
-%if 0%{?fedora} > 6
-BuildRequires: kdelibs3-devel
-%else
+# GStreamer support seems dropped for now
+#BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 BuildRequires: kdelibs-devel
-%endif
-%{?_enable_npplayer:BuildRequires: nspr-devel dbus-glib-devel dbus-qt-devel gtk2-devel}
-BuildRequires: xine-lib-devel 
+BuildRequires: phonon-devel
+BuildRequires: gtk2-devel
+BuildRequires: dbus-devel 
+BuildRequires: dbus-glib-devel
+BuildRequires: glib2-devel
 
 %description
 %{summary}.
 
-
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .icon
-
+%patch2 -p1 -b .no-x-text
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking \
-  --enable-final \
-  --disable-koffice-plugin \
-  %{?_enable_cairo} %{!?_enable_cairo:--disable-cairo} \
-  %{?_enable_npplayer} \
-  %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer}
-
-make %{?_smp_mflags}
-
+%{cmake_kde4} -DWITH_EXPAT:BOOL=ON .
+make %{?_smp_mflags} VERBOSE=1
 
 %install
 rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop
+  --dir %{buildroot}%{_datadir}/applications \
+  --delete-original \
+  %{buildroot}%{_datadir}/applications/kde4/*.desktop
 
 ## File lists
 # locale's
 %find_lang %{name} 
 # HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
+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
@@ -91,46 +76,49 @@
 done
 fi
 
-# omit x-mplayer2.desktop.  It's in kdelibs now. 
-rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
 %clean
 rm -rf %{buildroot}
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/oxygen &>/dev/null
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/oxygen &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+fi
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/oxygen &>/dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README 
-%{?_with_gstreamer:%{_bindir}/kgstplayer}
+%doc AUTHORS ChangeLog COPYING* README TODO
 %{_bindir}/kmplayer
-%{?_enable_npplayer:%{_bindir}/knpplayer}
-%{_bindir}/kxineplayer
-%{_bindir}/kxvplayer
-%{_datadir}/apps/kmplayer/
-%{_datadir}/applications/kde/*.desktop
+%{_bindir}/kphononplayer
+%{_bindir}/knpplayer
+%{_datadir}/kde4/apps/kmplayer/
+%{_datadir}/applications/*.desktop
 %{_datadir}/config/*rc
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/application/x-kmplayer.desktop
-%{_datadir}/mimelnk/video/x-ms-wmp.desktop
-%{_datadir}/services/*
-%{_libdir}/libkmplayercommon.[ls][ao]
-%{_libdir}/libkdeinit_*.[ls][ao]
-%{_libdir}/kde3/*.[ls][ao]
+%{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/kde4/services/*
+%{_libdir}/kde4/*.so
+%{_libdir}/*.so
 
 
 %changelog
+* Tue Mar 24 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.0a-1
+- kmplayer-0.11.0a (KDE4)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0c-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jan 2008 17:23:03 -0000	1.2
+++ sources	24 Mar 2009 18:07:33 -0000	1.3
@@ -1 +1 @@
-3e76147784b2642891c9efbfe260e4c4  kmplayer-0.10.0c.tar.bz2
+928709fe074b3556f186a887bd935d73  kmplayer-0.11.0a.tar.bz2


--- kmplayer-0.10.0c-icon.patch DELETED ---