[rpms/ktouch] epel10: kf5-based

[rpms/ktouch] epel10: kf5-based

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/ktouch
Branch : epel10
Commit : d373d769ce70fcc5340f7151cf9f158d68b6c852
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2017-01-12T07:15:10-06:00
Stats  : +47/-34 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ktouch/c/d373d769ce70fcc5340f7151cf9f158d68b6c852?branch=epel10

Log:
kf5-based

---
diff --git a/.gitignore b/.gitignore
index 8449553..1bb9cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-/ktouch-16.04.0.tar.xz
-/ktouch-16.04.1.tar.xz
-/ktouch-16.04.2.tar.xz
-/ktouch-16.04.3.tar.xz
-/ktouch-16.07.80.tar.xz
-/ktouch-16.07.90.tar.xz
-/ktouch-16.08.0.tar.xz
-/ktouch-16.08.1.tar.xz
-/ktouch-16.08.2.tar.xz
-/ktouch-16.08.3.tar.xz
 /ktouch-16.12.1.tar.xz

diff --git a/ktouch.spec b/ktouch.spec
index 3885f85..ddf9687 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -4,8 +4,9 @@ Version: 16.12.1
 Release: 1%{?dist}
 
 License: GPLv2+
-URL:     https://quickgit.kde.org/?p=%{name}.git
+URL:     https://www.kde.org/applications/education/ktouch/
 
+%global majmin_ver %(echo %{version} | cut -d. -f1,2)
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -15,13 +16,39 @@ URL:     https://quickgit.kde.org/?p=%{name}.git
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: extra-cmake-modules
+BuildRequires: kf5-rpm-macros
+BuildRequires: cmake(KF5Completion)
+BuildRequires: cmake(KF5Config)
+BuildRequires: cmake(KF5ConfigWidgets)
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5Declarative)
+BuildRequires: cmake(KF5DocTools)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5ItemViews)
+BuildRequires: cmake(KF5KCMUtils)
+BuildRequires: cmake(KF5TextWidgets)
+BuildRequires: cmake(KF5WidgetsAddons)
+BuildRequires: cmake(KF5WindowSystem)
+BuildRequires: cmake(KF5XmlGui)
+BuildRequires: cmake(Qt5Gui)
+BuildRequires: cmake(Qt5Qml)
+BuildRequires: cmake(Qt5Quick)
+BuildRequires: cmake(Qt5QuickWidgets)
+BuildRequires: cmake(Qt5Script)
+BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5Test)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5X11Extras)
+BuildRequires: cmake(Qt5Xml)
+BuildRequires: cmake(Qt5XmlPatterns)
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
 %endif
+BuildRequires: pkgconfig(xcb-xkb)
+BuildRequires: pkgconfig(xkbfile)
 
-%{?kde_runtime_requires}
-Requires: kqtquickcharts%{?_isa} >= %{version}
+Requires:      kqtquickcharts%{?_isa} >= %{majmin_ver}
 
 # when split occurred
 Conflicts: kdeedu < 4.7.0-10
@@ -31,13 +58,13 @@ Conflicts: kdeedu < 4.7.0-10
 
 
 %prep
-%setup -q
+%autosetup
 
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -46,44 +73,40 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-mkdir -p %{buildroot}%{_kde4_datadir}/appdata
-mv %{buildroot}%{_kde4_datadir}/metainfo/org.kde.%{name}.appdata.xml \
-   %{buildroot}%{_kde4_datadir}/appdata/ ||:
-
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/org.kde.%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %files
 %doc AUTHORS
 %license COPYING
-%lang(en) %{_kde4_docdir}/HTML/en/ktouch/
-%{_kde4_bindir}/ktouch
-%{_kde4_appsdir}/ktouch/
-%{_kde4_datadir}/appdata/org.kde.%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/org.kde.%{name}.desktop
-%{_kde4_datadir}/config.kcfg/ktouch.kcfg
-%{_kde4_iconsdir}/hicolor/*/*/ktouch.*
+%lang(en) %{_kf5_docdir}/HTML/en/ktouch/
+%{_kf5_bindir}/ktouch
+%{_kf5_datadir}/ktouch/
+%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_kf5_datadir}/config.kcfg/ktouch.kcfg
+%{_kf5_datadir}/icons/hicolor/*/*/ktouch.*
 %{_mandir}/man1/ktouch.*
 
 
 %changelog
 * Wed Jan 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 16.12.1-1
-- 16.12.1
+- 16.12.1, kf5-based
 
 * Mon Dec 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 16.08.3-1
 - 16.08.3