From 1e91783ea54ec6963edcfd1bc0a683fcec2deffa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Jun 2015 13:28:22 -0500 Subject: [PATCH] 1:5.3.1-3 - (re)enable en-only HTML docs (others provided by kde-l10n) - +%{?kf5_kinit_requires}, - .spec cosmetics --- khelpcenter.spec | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/khelpcenter.spec b/khelpcenter.spec index 512e493..33daabd 100644 --- a/khelpcenter.spec +++ b/khelpcenter.spec @@ -1,6 +1,6 @@ Name: khelpcenter Version: 5.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application to show KDE Application's documentation # Override khelpcenter subpackage from kde-runtime-15.04 (no longer built) Epoch: 1 @@ -23,7 +23,7 @@ BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kinit-devel +BuildRequires: kf5-kinit-devel >= 5.10.0-3 BuildRequires: kf5-kcmutils-devel BuildRequires: kf5-khtml-devel BuildRequires: kf5-kdelibs4support-devel @@ -36,26 +36,32 @@ BuildRequires: kde-filesystem Requires: kf5-filesystem +# libkdeinit5_* +%{?kf5_kinit_requires} + %description %{summary}. + %prep -%setup -q -n %{name}-%{version} +%setup -q +mv doc/CMakeLists.txt doc/CMakeLists.txt.en_only +grep 'add_subdirectory(en)' doc/CMakeLists.txt.en_only > doc/CMakeLists.txt -%build -sed -i "s/add_subdirectory( doc )/#add_subdirectory( doc )/" CMakeLists.txt -mkdir -p %{_target_platform} +%build +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang khelpcenter5 --with-qt --with-kde --all-name +%find_lang khelpcenter5 --with-qt --all-name # Provide khelpcenter service for KDE 3 and KDE 4 applications mkdir -p %{buildroot}/%{_kde4_datadir}/services @@ -69,6 +75,7 @@ cp %{buildroot}/%{_datadir}/kservices5/khelpcenter.desktop \ %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.Help.desktop + %files -f khelpcenter5.lang %doc README.htdig README.metadata COPYING %{_bindir}/khelpcenter @@ -78,7 +85,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.Help.desktop %{_libexecdir}/khc_mansearch.pl %{_libexecdir}/khc_docbookdig.pl %{_kf5_libdir}/libkdeinit5_khelpcenter.so -%{_kf5_datadir}/khelpcenter +%{_kf5_datadir}/khelpcenter/ %{_kf5_datadir}/kxmlgui5/khelpcenter/khelpcenterui.rc %{_datadir}/applications/org.kde.Help.desktop %{_datadir}/config.kcfg/khelpcenter.kcfg @@ -86,8 +93,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.Help.desktop %{_datadir}/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml %{_kde4_datadir}/services/khelpcenter.desktop %{_kde4_datadir}/kde4/services/khelpcenter.desktop +%lang(en) /usr/share/doc/HTML/en/fundamentals/ +%lang(en) /usr/share/doc/HTML/en/khelpcenter/ +%lang(en) /usr/share/doc/HTML/en/onlinehelp/ + %changelog +* Mon Jun 01 2015 Rex Dieter - 1:5.3.1-3 +- (re)enable en-only HTML docs (others provided by kde-l10n) +- +%%{?kf5_kinit_requires}, +- .spec cosmetics + * Fri May 29 2015 Daniel Vrátil - 1:5.3.1-2 - bump Epoch to override khelpcenter subpackage from kde-runtime-15.04