rpms/kmplayer/devel kmplayer.spec,1.8,1.9

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kmplayer.spec 
Log Message:
cleanup, cosmetics
fix conflicts
update description/summary



Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/devel/kmplayer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kmplayer.spec	24 Mar 2009 19:27:58 -0000	1.8
+++ kmplayer.spec	24 Mar 2009 19:31:13 -0000	1.9
@@ -1,5 +1,5 @@
 Name:    kmplayer
-Summary: Video plugin for Konqueror and basic Xine frontend 
+Summary: A simple frontend for MPlayer/FFMpeg/Phonon.
 Version: 0.11.0a
 Release: 1%{?dist}
 Group:   Applications/Multimedia
@@ -15,21 +15,21 @@
 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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # 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
 # Backported from trunk: http://websvn.kde.org/?view=rev&revision=922640
 Patch3:  kmplayer-0.11.0a-phonon-space-in-url-fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: cairo-devel
 BuildRequires: pango-devel
 BuildRequires: desktop-file-utils
 BuildRequires: expat-devel
 BuildRequires: gettext
-# GStreamer support seems dropped for now
-#BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs4-devel
 BuildRequires: phonon-devel
 BuildRequires: gtk2-devel
 BuildRequires: dbus-devel 
@@ -37,7 +37,11 @@
 BuildRequires: glib2-devel
 
 %description
-%{summary}.
+KMPlayer, a simple frontend for MPlayer/FFMpeg/Phonon.
+It can play DVD/VCD movies, from file or url and from a video device.
+KMPlayer can embed inside konqueror. Which means if you click
+on a movie file, the movie is played inside konqueror.
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
@@ -46,18 +50,26 @@
 %patch2 -p1 -b .no-x-text
 %patch3 -p4 -b .phonon-spaces
 
+
 %build
-%{cmake_kde4} -DWITH_EXPAT:BOOL=ON .
-make %{?_smp_mflags} VERBOSE=1
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+ -DWITH_EXPAT:BOOL=ON \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications \
-  --delete-original \
-  %{buildroot}%{_datadir}/applications/kde4/*.desktop
+make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+# FIXME/TODO: wacko docs? (conflicts with konq_plugins, but that's probably wrong too)
+mv %{buildroot}%{_kde4_docdir}/HTML/en/doc %{buildroot}%{_kde4_docdir}/HTML/en/kmplayer
 
 ## File lists
 # locale's
@@ -79,43 +91,48 @@
 done
 fi
 
+## unpackaged files
+# oxygen conflicts
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/kmplayer.*
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmplayer.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-/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 || :
+touch --no-create %{_kde4_iconsdir}hicolor &>/dev/null || :
 
 %postun
-/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
+    touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null
+    update-desktop-database -q &> /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 || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+update-desktop-database -q &> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING* README TODO
-%{_bindir}/kmplayer
-%{_bindir}/kphononplayer
-%{_bindir}/knpplayer
-%{_datadir}/kde4/apps/kmplayer/
-%{_datadir}/applications/*.desktop
-%{_datadir}/config/*rc
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
-%{_datadir}/kde4/services/*
-%{_libdir}/kde4/*.so
-%{_libdir}/*.so
+%{_kde4_bindir}/kmplayer
+%{_kde4_bindir}/knpplayer
+%{_kde4_bindir}/kphononplayer
+%{_kde4_appsdir}/kmplayer/
+%{_kde4_configdir}/kmplayerrc
+%{_kde4_datadir}/applications/kde4/kmplayer.desktop
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/libkdeinit4_kmplayer.so
+%{_kde4_libdir}/libkmplayercommon.so
 
 
 %changelog