pull in upstream fixes

use pkgconfig(Qt5...) style deps
use %make_build %lconfig_scriptlets

.gitignore

@@ -1,8 +1,4 @@
-/ktexteditor-5.40.0.tar.xz
-/ktexteditor-5.41.0.tar.xz
-/ktexteditor-5.42.0.tar.xz
-/ktexteditor-5.43.0.tar.xz
-/ktexteditor-5.44.0.tar.xz
-/ktexteditor-5.45.0.tar.xz
 /ktexteditor-5.46.0.tar.xz
 /ktexteditor-5.47.0.tar.xz
+/0001-Fix-caret-width.patch
+/0002-CVE-2018-10361-privilege-escalation.patch

kf5-ktexteditor.spec

@@ -9,7 +9,7 @@
 
 Name:           kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 with advanced embeddable text editor
 
 License:        LGPLv2+
@@ -25,6 +25,8 @@ URL:            https://cgit.kde.org/%{framework}.git
 Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 ## upstream patches (lookaside cache)
+Patch1: 0001-Fix-caret-width.patch
+Patch2: 0002-CVE-2018-10361-privilege-escalation.patch
 
 ## upstreamable patches
 
@@ -43,17 +45,17 @@ BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  kf5-sonnet-devel >= %{majmin}
 BuildRequires:  kf5-syntax-highlighting-devel >= %{majmin}
 
-BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  cmake(Qt5PrintSupport)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  cmake(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5Xml)
-BuildRequires:  cmake(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
 
 %if 0%{?fedora} >= 22
 BuildRequires:  libgit2-devel >= 0.22.0
 %endif
 %if 0%{?tests}
-BuildRequires: cmake(Qt5Script)
+BuildRequires: pkgconfig(Qt5Script)
 BuildRequires: dbus-x11
 BuildRequires: time
 BuildRequires: xorg-x11-server-Xvfb
@@ -90,13 +92,13 @@ pushd %{_target_platform}
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-qt
+%find_lang %{name} --all-name --with-html
 
 # create/own dirs
 mkdir -p %{buildroot}%{_kf5_qtplugindir}/ktexteditor
@@ -112,8 +114,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 %endif
 
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %doc README.md
@@ -143,6 +144,11 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- pull in upstream fixes
+- use pkgconfig(Qt5...) style deps
+- use %%make_build %%lconfig_scriptlets
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0
 

sources

@@ -1 +1,3 @@
 SHA512 (ktexteditor-5.47.0.tar.xz) = 3f5480ebd2540617e48c4c5167fde858b8b77dba9289f6f53951aa3c4f1e5ad7de8ba600d8b2872056bb6319c89c5b2b8c400e4e5aeec63ea793cc88c5b913bd
+SHA512 (0001-Fix-caret-width.patch) = 9d8c090641d25a08cde648a4b50cbd87a862ae311a158b55ca7acd433fb5d322c56e24432c690bf34ddb4edc512617911e7e11ace967118f2d61010cf8405586
+SHA512 (0002-CVE-2018-10361-privilege-escalation.patch) = 61bc89d0d631e61439b1391fb1a630d7f6fc59b0218beff7e5e0e64389bf2ddb380ffb9900926ac6b8ac9d13835a35c35d6c198123fe3f8d81027f12ae077dc7