[kde-runtime: 2/3] Revert "Split khelpcenter and -docs into subpackages to improve coinstallability with Plasma 5"

[Rex Dieter]

commit 0d59ddb383381a3eaaee3bad56b768e0496093ed
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Aug 6 14:10:48 2014 -0500

    Revert "Split khelpcenter and -docs into subpackages to improve coinstallability with Plasma 5"
    
    This reverts commit 4c59095e25de18c51f67deacc183246982fc6004.

 kde-runtime.spec |   61 ++++++++++++-----------------------------------------
 1 files changed, 14 insertions(+), 47 deletions(-)
---
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 7026d48..0a6aea4 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -9,7 +9,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.13.3
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -188,14 +188,6 @@ BuildArch: noarch
 %description flags
 %{summary}.
 
-%package docs
-Summary: User documentation and manuals
-Obsoletes: %{name} < 4.13.3-3
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-%description docs
-%{summary}.
-
 %package kio-smb
 Summary: Samba KIO slave
 # upgrade path
@@ -204,14 +196,6 @@ Requires: %{name} = %{version}-%{release}
 %description kio-smb
 %{summary}.
 
-%package -n khelpcenter
-Summary: KDE Help Center
-# upgrade path
-Obsoletes: kde-runtime < 4.13.3-3
-Requires: %{name} = %{version}-%{release}
-%description -n khelpcenter
-%{summary}.
-
 
 %prep
 %setup -q -n kde-runtime-%{version}
@@ -322,7 +306,6 @@ fi
 %files
 %doc COPYING COPYING.LIB
 %{_kde4_bindir}/*
-%exclude %{_kde4_bindir}/khelpcenter
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/hardwarenotifications/
 %{_kde4_appsdir}/kcm_componentchooser/
@@ -331,6 +314,7 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kde/
 %{_kde4_appsdir}/kglobalaccel/
+%{_kde4_appsdir}/khelpcenter/
 %{_kde4_appsdir}/kio_bookmarks/
 %{_kde4_appsdir}/kio_desktop/
 %{_kde4_appsdir}/kio_docfilter/
@@ -345,12 +329,10 @@ fi
 %{_kde4_appsdir}/remoteview/network.desktop
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%exclude %{_kde4_datadir}/config.kcfg/khelpcenter.kcfg
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/*.service
 %{_kde4_datadir}/kde4/services/*.desktop
-%exclude %{_kde4_datadir}/kde4/services/khelpcenter.desktop
 %{_kde4_datadir}/kde4/services/qimageioplugins/webp.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
 %{_kde4_datadir}/kde4/services/kded/
@@ -362,7 +344,6 @@ fi
 %{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%exclude %{_kde4_libdir}/libkdeinit4_khelpcenter.so
 %{_kde4_libdir}/kde4/platformimports/
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
@@ -371,24 +352,35 @@ fi
 %{_kde4_libexecdir}/kdesu
 %attr(2755,root,nobody) %{_kde4_libexecdir}/kdesud
 %{_kde4_libexecdir}/kdontchangethehostname
+%{_kde4_libexecdir}/khc_docbookdig.pl
+%{_kde4_libexecdir}/khc_htdig.pl
+%{_kde4_libexecdir}/khc_htsearch.pl
+%{_kde4_libexecdir}/khc_indexbuilder
+%{_kde4_libexecdir}/khc_mansearch.pl
 %{_kde4_libexecdir}/kioexec
 %{_kde4_libexecdir}/knetattach
+%{_mandir}/man1/*
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_docdir}/HTML/en/*
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
 %{_kde4_datadir}/applications/kde4/Help.desktop
 %{_kde4_datadir}/applications/kde4/knetattach.desktop
 %{_kde4_configdir}/kshorturifilterrc
 %{_kde4_datadir}/desktop-directories/*.directory
-%exclude %{_kde4_datadir}/desktop-directories/kde-information.directory
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/l10n/
 %{_kde4_datadir}/locale/currency/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
+%{_datadir}/services/khelpcenter.desktop
 %{_polkit_qt_policydir}/*.policy
 %{_sysconfdir}/dbus-1/system.d/*
 #exclude %{_kde4_datadir}/kde4/services/smb.protocol
+#exclude %{_kde4_docdir}/HTML/en/kcontrol/smb/
+#exclude %{_kde4_docdir}/HTML/en/kioslave/smb/
 
 #files kio-smb
+%{_kde4_docdir}/HTML/en/kcontrol/smb/
+%{_kde4_docdir}/HTML/en/kioslave/smb/
 %dir %{_kde4_appsdir}/konqueror/dirtree/
 %dir %{_kde4_appsdir}/konqueror/dirtree/remote/
 %{_kde4_appsdir}/konqueror/dirtree/remote/smb-network.desktop
@@ -442,33 +434,8 @@ fi
 %{_kde4_datadir}/locale/l10n/*/flag.png
 %endif
 
-%files docs
-%{_mandir}/man1/*
-%{_kde4_docdir}/HTML/en/*
-# khelpcenter installs it's own documentation
-%exclude %{_kde4_docdir}/HTML/en/khelpcenter
-%exclude %{_kde4_docdir}/HTML/en/fundamentals
-%exclude %{_kde4_docdir}/HTML/en/onlinehelp
-
-
-
-%files -n khelpcenter
-%{_kde4_bindir}/khelpcenter
-%{_kde4_libexecdir}/khc_*
-%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-%{_kde4_docdir}/HTML/en/khelpcenter
-%{_kde4_docdir}/HTML/en/fundamentals
-%{_kde4_docdir}/HTML/en/onlinehelp
-%{_kde4_appsdir}/khelpcenter
-%{_kde4_datadir}/kde4/services/khelpcenter.desktop
-%{_kde4_datadir}/services/khelpcenter.desktop
-%{_kde4_datadir}/config.kcfg/khelpcenter.kcfg
-%{_kde4_datadir}/desktop-directories/kde-information.directory
 
 %changelog
-* Tue Aug 05 2014 Daniel Vrátil <dvratil at redhat.com> - 4.13.3-3
-- Split khelpcenter and -docs into subpackages to improve coinstallability with Plasma 5
-
 * Thu Jul 17 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.3-2
 - rebuild (for pulseaudio, bug #1117683)