From 2cf6c2125495e4428b9997051a6ae9e836c2ba5fd42e6b5bf7ddbb9c3837eb88 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 3 Dec 2016 13:51:59 +0000 Subject: [PATCH 1/3] Accepting request 443415 from home:luca_b:test_KA KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443415 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ktouch?expand=0&rev=37 --- ktouch-16.08.3.tar.xz | 3 -- ktouch-16.11.80.tar.xz | 3 ++ ktouch.changes | 8 +++++ ktouch.spec | 68 +++++++++++++++++++++++++++++------------- 4 files changed, 58 insertions(+), 24 deletions(-) delete mode 100644 ktouch-16.08.3.tar.xz create mode 100644 ktouch-16.11.80.tar.xz diff --git a/ktouch-16.08.3.tar.xz b/ktouch-16.08.3.tar.xz deleted file mode 100644 index 36134c8..0000000 --- a/ktouch-16.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de4684c9fd3b27075ce668d774e718408bd4d911778e4607b7fb47dc62924d5e -size 2422000 diff --git a/ktouch-16.11.80.tar.xz b/ktouch-16.11.80.tar.xz new file mode 100644 index 0000000..286f407 --- /dev/null +++ b/ktouch-16.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38055369db85fb5a2965a1cfdb6002cbb435d7138b31a859b8baa3cf2a58a310 +size 1650924 diff --git a/ktouch.changes b/ktouch.changes index cda7b2c..056a3ed 100644 --- a/ktouch.changes +++ b/ktouch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 29 12:37:33 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.80 + * KDE Applications 16.12.0 Beta + * https://www.kde.org/announcements/announce-applications-16.12-beta.php + + ------------------------------------------------------------------- Wed Nov 9 06:24:03 UTC 2016 - lbeltrame@kde.org diff --git a/ktouch.spec b/ktouch.spec index cf268cd..581cad2 100644 --- a/ktouch.spec +++ b/ktouch.spec @@ -1,7 +1,7 @@ # # spec file for package ktouch # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,48 @@ Name: ktouch -Version: 16.08.3 +Version: 16.11.80 Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Touch Typing Tutor License: GPL-2.0+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libkde4-devel +BuildRequires: kcmutils-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdeclarative-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: kitemviews-devel +BuildRequires: knewstuff-devel +BuildRequires: ktexteditor-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kxmlgui-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: xz +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(Qt5XmlPatterns) +BuildRequires: pkgconfig(xkbfile) +# Runtime dep +Requires: kqtquickcharts Provides: kde4-ktouch = 4.3.0 Obsoletes: kde4-ktouch < 4.3.0 -# Runtime dep -Requires: kqtquickcharts >= %{version} -Requires: libqt4-sql-sqlite BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description A KDE program that helps you to learn and practice touch typing. @@ -44,25 +70,25 @@ A KDE program that helps you to learn and practice touch typing. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - %suse_update_desktop_file org.kde.%{name} X-KDE-Edu-Teaching - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.ktouch X-KDE-Edu-Teaching %files %defattr(-,root,root) -%doc AUTHORS COPYING* README -%dir %{_kde4_datadir}/metainfo -%doc %lang(en) %{_kde4_htmldir}/en/ktouch/ -%{_kde4_applicationsdir}/org.kde.ktouch.desktop -%{_kde4_appsdir}/ktouch/ -%{_kde4_bindir}/ktouch -%{_kde4_configkcfgdir}/ktouch.kcfg -%{_kde4_datadir}/metainfo/org.kde.ktouch.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/ktouch.* -%{_kde4_mandir}/man1/ktouch.1.gz +%doc AUTHORS COPYING* README.md +%doc %lang(en) %{_kf5_htmldir}/en/ktouch/ +%{_kf5_applicationsdir}/org.kde.ktouch.desktop +%{_kf5_appsdir}/ktouch/ +%{_kf5_bindir}/ktouch +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/ktouch.kcfg +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.ktouch.appdata.xml +%{_kf5_iconsdir}/hicolor/*/apps/ktouch.* +%{_kf5_mandir}/man1/ktouch.1.gz %changelog From d6558009e9a0fcd020eef8d4da180244d0ea0d333904af0d8c72b5c00e94a975 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 3 Dec 2016 16:39:55 +0000 Subject: [PATCH 2/3] update to (16.11.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ktouch?expand=0&rev=38 --- ktouch-16.11.80.tar.xz | 3 --- ktouch-16.11.90.tar.xz | 3 +++ ktouch.changes | 8 ++++++++ ktouch.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 ktouch-16.11.80.tar.xz create mode 100644 ktouch-16.11.90.tar.xz diff --git a/ktouch-16.11.80.tar.xz b/ktouch-16.11.80.tar.xz deleted file mode 100644 index 286f407..0000000 --- a/ktouch-16.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38055369db85fb5a2965a1cfdb6002cbb435d7138b31a859b8baa3cf2a58a310 -size 1650924 diff --git a/ktouch-16.11.90.tar.xz b/ktouch-16.11.90.tar.xz new file mode 100644 index 0000000..75ea66d --- /dev/null +++ b/ktouch-16.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fe72b60491271e569bdde88a6eba4a5d952ab81ced61ebd8149782dfaddbbca +size 1650364 diff --git a/ktouch.changes b/ktouch.changes index 056a3ed..2d675f4 100644 --- a/ktouch.changes +++ b/ktouch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 3 16:39:50 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.90 + * KDE Applications 16.12.0 RC + * https://www.kde.org/announcements/announce-applications-16.12-rc.php + + ------------------------------------------------------------------- Tue Nov 29 12:37:33 UTC 2016 - tittiatcoke@gmail.com diff --git a/ktouch.spec b/ktouch.spec index 581cad2..e673912 100644 --- a/ktouch.spec +++ b/ktouch.spec @@ -17,10 +17,10 @@ Name: ktouch -Version: 16.11.80 +Version: 16.11.90 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.90 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Touch Typing Tutor License: GPL-2.0+ From 60aabf368bd89c4ed08dfcd626b4c4601308d01c2bef0353d62ba340957d59e8 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 13 Dec 2016 19:55:25 +0000 Subject: [PATCH 3/3] update to (16.12.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ktouch?expand=0&rev=39 --- ktouch-16.11.90.tar.xz | 3 --- ktouch-16.12.0.tar.xz | 3 +++ ktouch.changes | 8 ++++++++ ktouch.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 ktouch-16.11.90.tar.xz create mode 100644 ktouch-16.12.0.tar.xz diff --git a/ktouch-16.11.90.tar.xz b/ktouch-16.11.90.tar.xz deleted file mode 100644 index 75ea66d..0000000 --- a/ktouch-16.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fe72b60491271e569bdde88a6eba4a5d952ab81ced61ebd8149782dfaddbbca -size 1650364 diff --git a/ktouch-16.12.0.tar.xz b/ktouch-16.12.0.tar.xz new file mode 100644 index 0000000..e2bcabb --- /dev/null +++ b/ktouch-16.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f5a74804dbde89975b8bf12119913412819abee9248aa046699b5196ccd017 +size 1651380 diff --git a/ktouch.changes b/ktouch.changes index 2d675f4..cb541ed 100644 --- a/ktouch.changes +++ b/ktouch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 13 19:55:21 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.12.0 + * KDE Applications 16.12.0 + * https://www.kde.org/announcements/announce-applications-16.12.0.php + + ------------------------------------------------------------------- Sat Dec 3 16:39:50 UTC 2016 - tittiatcoke@gmail.com diff --git a/ktouch.spec b/ktouch.spec index e673912..4bfef12 100644 --- a/ktouch.spec +++ b/ktouch.spec @@ -17,10 +17,10 @@ Name: ktouch -Version: 16.11.90 +Version: 16.12.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.90 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Touch Typing Tutor License: GPL-2.0+