From 83cbf2040434065013fa8009a76c230ec22cf1c4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 02 2018 14:07:17 +0000 Subject: -doc: drop Obsoletes: kde-runtime-docs (#1550857,#1199720) bump min qt5/kf5 dep use %make_build %ldconfig_scriptlets drop konq4 support (last used f25) --- diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 8c89315..f40cb3c 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,14 +1,10 @@ -%global kf5_version_min 5.26.0 -%if 0%{?fedora} < 26 -# support kde4-based konqueror (or not) -%global konq4 1 -%endif +%global kf5_version_min 5.42 Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.12.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://cgit.kde.org/%{name}.git @@ -46,7 +42,7 @@ BuildRequires: xcb-util-devel BuildRequires: libxkbcommon-devel BuildRequires: pkgconfig(xkeyboard-config) -BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-devel >= 5.9 BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtdeclarative-devel @@ -157,9 +153,6 @@ method framework. %package doc Summary: Documentation and user manuals for %{name} -# per https://bugzilla.redhat.com/show_bug.cgi?id=1199720 -# I abhor unversioned Obsoletes, so adding one here with Epoch:1 to be on the safe side -- rex -Obsoletes: kde-runtime-docs < 1:14.12.3-2 # when conflicting HTML docs were removed Conflicts: kcm_colors < 1:4.11.16-10 # when made noarch @@ -196,12 +189,13 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang %{name} --with-html --with-qt --all-name + +%find_lang %{name} --with-html --all-name grep "%{_kf5_docdir}" %{name}.lang > %{name}-doc.lang cat %{name}.lang %{name}-doc.lang | sort | uniq -u > plasmadesktop5.lang @@ -209,13 +203,6 @@ cat %{name}.lang %{name}-doc.lang | sort | uniq -u > plasmadesktop5.lang # No -devel rm -fv %{buildroot}%{_libdir}/libkfontinst{,ui}.so -%if 0%{?konq4} -# Copy konqsidebartng to kde4/apps so that KDE Konqueror can find it -mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/ -cp %{buildroot}%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop \ - %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services -%endif - # rename script to force it to run again (initial 5.5.0 version was buggy) mv %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/updates/obsolete_kickoffrc.js \ %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/updates/obsolete_kickoffrc-1.js @@ -229,9 +216,8 @@ rm -rfv %{buildroot}%{_datadir}/locale/*/LC_SCRIPTS/kfontinst/ %check desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,knetattach}.desktop -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f plasmadesktop5.lang %license COPYING* @@ -285,9 +271,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %{_kf5_datadir}/kcmkeyboard %{_kf5_datadir}/kpackage/kcms/* %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop -%if 0%{?konq4} -%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop -%endif %{_kf5_datadir}/kf5/kactivitymanagerd/workspace/ %{_kf5_datadir}/kcmsolidactions/ %{_kf5_datadir}/solid/devices/*.desktop @@ -315,6 +298,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %changelog +* Fri Mar 02 2018 Rex Dieter - 5.12.2-2 +- -doc: drop Obsoletes: kde-runtime-docs (#1550857,#1199720) +- bump min qt5/kf5 dep +- use %%make_build %%ldconfig_scriptlets +- drop konq4 support (last used f25) + * Wed Feb 21 2018 Jan Grulich - 5.12.2-1 - 5.12.2