rpms/kmplayer/devel kmplayer-0.11.0a-fix_docs.patch, NONE, 1.1 kmplayer.spec, 1.10, 1.11

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kmplayer.spec 
Added Files:
	kmplayer-0.11.0a-fix_docs.patch 
Log Message:
fix docs via (upstreamable) patch


kmplayer-0.11.0a-fix_docs.patch:

--- NEW FILE kmplayer-0.11.0a-fix_docs.patch ---
diff -up kmplayer-0.11.0a/doc/CMakeLists.txt.fix_docs kmplayer-0.11.0a/doc/CMakeLists.txt
--- kmplayer-0.11.0a/doc/CMakeLists.txt.fix_docs	2009-01-25 13:57:46.000000000 -0600
+++ kmplayer-0.11.0a/doc/CMakeLists.txt	2009-03-25 13:47:41.000000000 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmplayer)


Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/devel/kmplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kmplayer.spec	24 Mar 2009 19:42:21 -0000	1.10
+++ kmplayer.spec	25 Mar 2009 18:50:12 -0000	1.11
@@ -12,7 +12,8 @@
 # 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+
+#License: GFDL and (MPLv1.1 or GPLv2+ or LGPLv2+) and BSD and GPLv2+ and LGPLv2 and LGPLv2+
+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)
@@ -25,6 +26,9 @@
 Patch3:  kmplayer-0.11.0a-phonon-space-in-url-fix.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
 BuildRequires: pango-devel
@@ -52,6 +56,7 @@
 %patch2 -p1 -b .no-x-text
 %patch3 -p4 -b .phonon-spaces
 %patch4 -p1 -b .kmplayerrc_phonon_default
+%patch5 -p1 -b .fix_docs
 
 
 %build
@@ -71,9 +76,6 @@
 
 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
 %find_lang %{name}