From 501b3010b3ab4c419dff5ce79fd0e264d7e62d64 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 06 2021 15:51:49 +0000 Subject: fix build, .spec cleanup --- diff --git a/khelpcenter.spec b/khelpcenter.spec index 6921340..2c99043 100644 --- a/khelpcenter.spec +++ b/khelpcenter.spec @@ -1,4 +1,3 @@ -%undefine __cmake_in_source_build Name: khelpcenter Summary: Show documentation for KDE applications # Override khelpcenter subpackage from kde-runtime-15.04 (no longer built) @@ -7,7 +6,7 @@ Version: 21.08.0 Release: 1%{?dist} License: GPLv2 or GPLv3 -URL: https://cgit.kde.org/%{name}.git +URL: https://invent.kde.org/system/%{name} %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -28,7 +27,6 @@ BuildRequires: kf5-kcoreaddons-devel BuildRequires: kf5-kdbusaddons-devel BuildRequires: kf5-kdoctools-devel BuildRequires: kf5-khtml-devel -BuildRequires: kf5-kinit-devel >= 5.10.0-3 BuildRequires: kf5-ki18n-devel BuildRequires: kf5-kservice-devel BuildRequires: kf5-kwindowsystem-devel @@ -44,11 +42,6 @@ BuildRequires: xapian-core-devel # translations moved here Conflicts: kde-l10n < 17.04.1-2 -Requires: kf5-filesystem - -# libkdeinit5_* -%{?kf5_kinit_requires} - %description %{summary}. @@ -58,7 +51,8 @@ Requires: kf5-filesystem %build -%{cmake_kf5} +%cmake_kf5 + %cmake_build @@ -81,15 +75,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.Help.desktop %files -f %{name}.lang %doc README.metadata -%license COPYING +%license LICENSES/* %{_bindir}/khelpcenter %{_kf5_datadir}/qlogging-categories5/khelpcenter.* %{_libexecdir}/khc_mansearch.pl %{_libexecdir}/khc_xapianindexer %{_libexecdir}/khc_xapiansearch -%{_kf5_libdir}/libkdeinit5_khelpcenter.so %{_kf5_datadir}/khelpcenter/ -%{_kf5_datadir}/kxmlgui5/khelpcenter/khelpcenterui.rc %{_kf5_metainfodir}/org.kde.Help.appdata.xml %{_datadir}/applications/org.kde.Help.desktop %{_datadir}/config.kcfg/khelpcenter.kcfg