From b0d3a1a891b11463ce6e36fc2faa923d57ee4c2e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 13 2018 20:42:13 +0000
Subject: fix FTBFS


pull in upstream fix, .spec cleanup

---

diff --git a/.gitignore b/.gitignore
index 32575a5..18eb1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-/kde-dev-utils-17.04.1.tar.xz
-/kde-dev-utils-17.04.2.tar.xz
-/kde-dev-utils-17.04.3.tar.xz
-/kde-dev-utils-17.08.1.tar.xz
-/kde-dev-utils-17.08.3.tar.xz
-/kde-dev-utils-17.12.0.tar.xz
-/kde-dev-utils-17.12.1.tar.xz
-/kde-dev-utils-17.12.2.tar.xz
-/kde-dev-utils-17.12.3.tar.xz
-/kde-dev-utils-18.04.0.tar.xz
-/kde-dev-utils-18.04.1.tar.xz
-/kde-dev-utils-18.04.2.tar.xz
 /kde-dev-utils-18.04.3.tar.xz
diff --git a/D14066.diff b/D14066.diff
new file mode 100644
index 0000000..5cc4d94
--- /dev/null
+++ b/D14066.diff
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,5 +10,8 @@
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMQtDeclareLoggingCategory)
+ 
++# Required for ki18n_install(po) added on tarball generation
++find_package(KF5 REQUIRED COMPONENTS I18n)
++
+ add_subdirectory(kpartloader)
+ add_subdirectory(kuiviewer)
+diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
+--- a/kpartloader/CMakeLists.txt
++++ b/kpartloader/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ find_package(KF5 REQUIRED
+     COMPONENTS
+     CoreAddons
+-    I18n
+     Parts
+     WidgetsAddons
+ )
+diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
+--- a/kuiviewer/CMakeLists.txt
++++ b/kuiviewer/CMakeLists.txt
+@@ -15,7 +15,6 @@
+     COMPONENTS
+     CoreAddons
+     KIO
+-    I18n
+     Parts
+ )
+ 
+
diff --git a/kde-dev-utils.spec b/kde-dev-utils.spec
index 855e343..3f3d306 100644
--- a/kde-dev-utils.spec
+++ b/kde-dev-utils.spec
@@ -14,6 +14,9 @@ URL:     https://cgit.kde.org/%{name}.git
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstream patches
+Patch: https://phabricator.kde.org/file/data/pwcgylcghgbudeootrot/PHID-FILE-g4znxbdmstkg6efpsyw5/D14066.diff
+
 BuildRequires:  desktop-file-utils
 #BuildRequires:  libtool-ltdl-devel
 #BuildRequires:  binutils-devel binutils-static
@@ -77,7 +80,7 @@ Requires:  %{name}-common = %{version}-%{release}
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 
 %build
@@ -86,7 +89,7 @@ pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install