From 0e4e1b756f58305f21fcf09e79453f4ba7beb8bf Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: May 25 2017 13:37:19 +0000
Subject: try harder to omit conflicting kde-runtime bits


---

diff --git a/kde-l10n.spec b/kde-l10n.spec
index b61a8fa..7862444 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -9,7 +9,7 @@
 Name:    kde-l10n
 Summary: Internationalization support for KDE Applications
 Version: 17.04.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Url:     http://www.kde.org
 License: LGPLv2
@@ -1068,12 +1068,16 @@ for i in $(cat %{SOURCE1000}) ; do
       rm -fv 4/$i/$j/messages/kdelibs/{akonadi*,*baloo*,nepomuk*}.po
       rm -fv 4/$i/$j/messages/applications/useraccount.po
       if [ -e 4/$i/$j/docs/kde-runtime/CMakeLists.txt ]; then
-        sed -i -e 's/add_subdirectory( *fundamentals *)/#add_subdirectory(fundamentals)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
-        sed -i -e 's/add_subdirectory( *kcontrol *)/#add_subdirectory(kcontrol)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
-        sed -i -e 's/add_subdirectory( *kdesu *)/#add_subdirectory(kdesu)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
-        sed -i -e 's/add_subdirectory( *khelpcenter *)/#add_subdirectory(khelpcenter)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
-        sed -i -e 's/add_subdirectory( *knetattach *)/#add_subdirectory(knetattach)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
-        sed -i -e 's/add_subdirectory( *onlinehelp *)/#add_subdirectory(onlinehelp)/g' 4/$i/$j/docs/kde-runtime/CMakeLists.txt
+        sed -i \
+          -e 's/add_subdirectory( *fundamentals *)/#add_subdirectory(fundamentals)/g' \
+          -e 's/add_subdirectory( *kcontrol *)/#add_subdirectory(kcontrol)/g' \
+          -e 's/add_subdirectory( *kdesu *)/#add_subdirectory(kdesu)/g' \
+          -e 's/add_subdirectory( *khelpcenter *)/#add_subdirectory(khelpcenter)/g' \
+          -e 's/add_subdirectory( *knetattach *)/#add_subdirectory(knetattach)/g' \
+          -e 's/add_subdirectory( *onlinehelp *)/#add_subdirectory(onlinehelp)/g' \
+          -e 's/add_subdirectory( *nepomuk *)/#add_subdirectory(nepomuk)/g' \
+          4/$i/$j/docs/kde-runtime/CMakeLists.txt
+          rm -rfv 4/$i/$j/docs/kde-runtime/{fundementals,kcontrol,kdesu,khelpcenter,knetattach,onlinehelp,nepomuk}
       fi
       # Provided by kdeplasma-addons
       sed -i -e 's/add_subdirectory( *kdeplasma-addons *)/#add_subdirectory(kdeplasma-addons)/g' 4/$i/$j/messages/CMakeLists.txt
@@ -1140,6 +1144,9 @@ rm -fv %{buildroot}%{_datadir}/locale/tr/ceviri_uygula.sh
 rm -rfv %{buildroot}%{_datadir}/locale/*/LC_SCRIPTS/ki18n5/
 # installs both kde4 and kf5 copies
 rm -rfv  %{buildroot}%{_kde4_appsdir}/kvtml/nn/
+%if 0%{?omit_plasma5_bits}
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/
+%endif
 
 
 %files
@@ -1647,6 +1654,9 @@ rm -rfv  %{buildroot}%{_kde4_appsdir}/kvtml/nn/
 
 
 %changelog
+* Thu May 25 2017 Rex Dieter <rdieter@fedoraproject.org> - 17.04.1-2
+- try harder to omit conflicting kde-runtime bits
+
 * Wed May 24 2017 Rex Dieter <rdieter@fedoraproject.org> - 17.04.1-1
 - 17.04.1