From 3a6aaafdc11e3de43f88c19985b94d4da8e25cbe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 7 Mar 2015 08:49:54 -0600 Subject: [PATCH] 5.2.1-4 - -doc: Obsoletes: kde-runtime-docs (#1199720) - %find_lang: drop --with-kde, we want handbooks in -doc instead --- plasma-desktop.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/plasma-desktop.spec b/plasma-desktop.spec index eddad53..c74b209 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop Version: 5.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -94,6 +94,9 @@ Conflicts: kcm_colors < 4.11.16-2 %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 %description doc %{summary}. @@ -115,7 +118,7 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang plasmadesktop5 --with-qt --with-kde --all-name +%find_lang plasmadesktop5 --with-qt --all-name # No -devel rm %{buildroot}/%{_libdir}/libkfontinst{,ui}.so @@ -146,7 +149,6 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : fi - %files -f plasmadesktop5.lang %{_bindir}/kapplymousetheme %{_bindir}/kaccess @@ -193,7 +195,7 @@ fi %{_kf5_datadir}/kxmlgui5/kfontinst %{_kf5_datadir}/knotifications5/*.notifyrc %{_kf5_datadir}/config.kcfg/* -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/system-services/*.service @@ -201,10 +203,17 @@ fi %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy %files doc -%{_docdir}/HTML/en/* +%{_docdir}/HTML/en/kcontrol +%{_docdir}/HTML/en/kfontview +%{_docdir}/HTML/en/knetattach +%{_docdir}/HTML/en/plasma-desktop %changelog +* Sat Mar 07 2015 Rex Dieter - 5.2.1-4 +- -doc: Obsoletes: kde-runtime-docs (#1199720) +- %%find_lang: drop --with-kde, we want handbooks in -doc instead + * Fri Mar 06 2015 Daniel Vrátil - 5.2.1-3 - Does not obsolete kcm_colors anymore (KDE 4 version is co-installable now)