- up to 0.11.3c

- gstreamer and xine was removed from project
- dropped all patches
- needs revert of xulrunner usage (rel 0.1)
- builds and works
- KDE3 -> KDE4
- BR: cmake

Changed files:
    kmplayer.spec -> 1.85

diff --git a/kmplayer.spec b/kmplayer.spec
index 3965de71b36c63b6a64c642d45cb7fd6049c4ecb..a5714d1c4121bcce6fa5114a40aeb3c13dfb2254 100644 (file)
--- a/kmplayer.spec
+++ b/kmplayer.spec
@@ -1,45 +1,27 @@
 #
 # Conditional build:
-%bcond_without gstreamer       # Do not build kgstplayer
 %bcond_with    koffice         # Build koffice plugin
-%bcond_without xine            # Do not build kxineplayer
 #
 Summary:       A KDE MPlayer/Xine/ffmpeg/ffserver/VDR frontend
 Summary(pl.UTF-8):     Frontend dla programów MPlayer/Xine/ffmpeg/ffserver/VDR pod KDE
 Name:          kmplayer
-Version:       0.10.0c
-Release:       2
+Version:       0.11.3c
+Release:       0.1
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Multimedia
-# http://kmplayer.kde.org/pkgs/kmplayer-0.9.3-pre1.tar.bz2
 Source0:       http://kmplayer.kde.org/pkgs/%{name}-%{version}.tar.bz2
-# Source0-md5: 3e76147784b2642891c9efbfe260e4c4
-Patch0:                kde-common-PLD.patch
-Patch1:                kde-ac260-lt.patch
-Patch2:                %{name}-flash.patch
+# Source0-md5: 3e9ef221ca15d264e553706c6e611eb9
 URL:           http://kmplayer.kde.org/
-BuildRequires: arts-qt-devel
-BuildRequires: artsc-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-qt-devel
-BuildRequires: expat-devel
-BuildRequires: gettext-devel
-%{?with_gstreamer:BuildRequires:       gstreamer-plugins-base-devel >= 0.10.0}
-BuildRequires: kdelibs-devel >= 9:3.5.3
+BuildRequires: cmake >= 2.8.0
+BuildRequires: dbus-glib-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: gtk+2-devel
+BuildRequires: kde4-kdelibs-devel
 %{?with_koffice:BuildRequires: koffice-devel}
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: nspr-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.357
-BuildRequires: sed >= 4.0
-%{?with_xine:BuildRequires:    xine-lib-devel >= 1:1.0}
-BuildRequires: xorg-lib-libXv-devel
-BuildRequires: zlib-devel
-Requires:      kdebase-core >= 9:3.5.3
-Requires:      kdelibs >= 9:3.5.3
+BuildRequires: xulrunner-devel
 Requires:      mplayer
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,18 +33,6 @@ GUI.
 W pełni zintegrowany z KDE frontend dla programów
 MPlayer/Xine/ffmpeg/ffserver/VDR.
 
-%package gstreamer
-Summary:       Gstreamer wrapper
-Summary(pl.UTF-8):     Wrapper gstreamera
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description gstreamer
-Gstreamer wrapper.
-
-%description gstreamer -l pl.UTF-8
-Wrapper gstreamera.
-
 %package koffice
 Summary:       Kmplayer integration with Koffice
 Summary(pl.UTF-8):     Integracja kmplayera z koffice
@@ -76,62 +46,22 @@ Kmplayer integration with Koffice.
 %description koffice -l pl.UTF-8
 Integracja kmplayera z koffice.
 
-%package xine
-Summary:       Xine wrapper
-Summary(pl.UTF-8):     Wrapper xine
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description xine
-Xine wrapper.
-
-%description xine -l pl.UTF-8
-Wrapper xine.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
-       src/kmplayer.desktop
-%{__sed} -i -e 's,plugin=/usr/lib/browser-plugins,plugin=%{_browserpluginsdir}', src/kmplayerrc
-
-mv configure{,.orig}
 
 %build
-if [ ! -f configure ]; then
-       cp /usr/share/automake/config.sub admin
-       %{__make} -f admin/Makefile.common cvs
-fi
-
-CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
-%configure \
-       --disable-rpath \
-       %{?with_koffice:--enable-koffice-plugin} \
-       %{!?with_gstreamer:--without-gstreamer} \
-       %{!?with_xine:--without-xine} \
-       --enable-expat \
-       --enable-npplayer \
-       --with-qt-libraries=%{_libdir}
-
-%{__make} -j1
+install -d build
+cd build
+%cmake \
+               .. \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir}
+%{__make} -C build install \
+        DESTDIR=$RPM_BUILD_ROOT
 
-# remove bogus translation
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
-
-# already in kdelibs
-rm $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
-
-%find_lang %{name} --with-kde
+%find_lang %{name} --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,29 +71,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/kmplayer
 %attr(755,root,root) %{_bindir}/knpplayer
-%attr(755,root,root) %{_bindir}/kxvplayer
-%{_libdir}/libkdeinit_kmplayer.la
-%attr(755,root,root) %{_libdir}/libkdeinit_kmplayer.so
-%{_libdir}/libkmplayercommon.la
+%attr(755,root,root) %{_bindir}/kphononplayer
+%attr(755,root,root) %{_libdir}/kde4/libkmplayerpart.so
+%attr(755,root,root) %{_libdir}/libkdeinit4_kmplayer.so
 %attr(755,root,root) %{_libdir}/libkmplayercommon.so
-%{_libdir}/kde3/kmplayer.la
-%attr(755,root,root) %{_libdir}/kde3/kmplayer.so
-%{_libdir}/kde3/libkmplayerpart.la
-%attr(755,root,root) %{_libdir}/kde3/libkmplayerpart.so
+%{_desktopdir}/kde4/kmplayer.desktop
+%{_docdir}/kde/HTML/en/kmplayer/common
+%{_docdir}/kde/HTML/en/kmplayer/index.cache.bz2
+%{_docdir}/kde/HTML/en/kmplayer/index.docbook
+%{_datadir}/kde4/services/kmplayer_part.desktop
 %{_datadir}/apps/kmplayer
 %{_datadir}/config/kmplayerrc
-%{_datadir}/mimelnk/application/x-kmplayer.desktop
-%{_datadir}/mimelnk/video/x-ms-wmp.desktop
-%{_datadir}/services/kmplayer_part.desktop
-%{_desktopdir}/kde/kmplayer.desktop
 %{_iconsdir}/[!l]*/*/apps/kmplayer.*
 
-%if %{with gstreamer}
-%files gstreamer
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kgstplayer
-%endif
-
 %if %{with koffice}
 %files koffice
 %defattr(644,root,root,755)
@@ -171,9 +91,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde3/libkmplayerkofficepart.so
 %{_datadir}/services/kmplayer_koffice.desktop
 %endif
-
-%if %{with xine}
-%files xine
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kxineplayer
-%endif