Accepting request 446120 from KDE:Applications

Update to KDE Applicatons 16.12.0

OBS-URL: https://build.opensuse.org/request/show/446120
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktouch?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger 2016-12-17 09:50:16 +00:00 committed by Git OBS Bridge
commit 8a333bf8bf
4 changed files with 74 additions and 24 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de4684c9fd3b27075ce668d774e718408bd4d911778e4607b7fb47dc62924d5e
size 2422000

3
ktouch-16.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2f5a74804dbde89975b8bf12119913412819abee9248aa046699b5196ccd017
size 1651380

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
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
- 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
- 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 Wed Nov 9 06:24:03 UTC 2016 - lbeltrame@kde.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package ktouch # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,22 +17,48 @@
Name: ktouch Name: ktouch
Version: 16.08.3 Version: 16.12.0
Release: 0 Release: 0
%define kf5_version 5.26.0
# 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 Summary: Touch Typing Tutor
License: GPL-2.0+ License: GPL-2.0+
Group: Amusements/Teaching/Other Group: Amusements/Teaching/Other
Url: http://edu.kde.org Url: http://edu.kde.org
Source0: %{name}-%{version}.tar.xz 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: 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 Provides: kde4-ktouch = 4.3.0
Obsoletes: 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%description %description
A KDE program that helps you to learn and practice touch typing. 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 %ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif %endif
%cmake_kde4 -d build %cmake_kf5 -d build
%make_jobs %make_jobs
%install %install
%kde4_makeinstall -C build %kf5_makeinstall -C build
%suse_update_desktop_file org.kde.%{name} X-KDE-Edu-Teaching %suse_update_desktop_file org.kde.ktouch X-KDE-Edu-Teaching
%kde_post_install
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING* README %doc AUTHORS COPYING* README.md
%dir %{_kde4_datadir}/metainfo %doc %lang(en) %{_kf5_htmldir}/en/ktouch/
%doc %lang(en) %{_kde4_htmldir}/en/ktouch/ %{_kf5_applicationsdir}/org.kde.ktouch.desktop
%{_kde4_applicationsdir}/org.kde.ktouch.desktop %{_kf5_appsdir}/ktouch/
%{_kde4_appsdir}/ktouch/ %{_kf5_bindir}/ktouch
%{_kde4_bindir}/ktouch %dir %{_kf5_configkcfgdir}
%{_kde4_configkcfgdir}/ktouch.kcfg %{_kf5_configkcfgdir}/ktouch.kcfg
%{_kde4_datadir}/metainfo/org.kde.ktouch.appdata.xml %dir %{_kf5_appstreamdir}
%{_kde4_iconsdir}/hicolor/*/apps/ktouch.* %{_kf5_appstreamdir}/org.kde.ktouch.appdata.xml
%{_kde4_mandir}/man1/ktouch.1.gz %{_kf5_iconsdir}/hicolor/*/apps/ktouch.*
%{_kf5_mandir}/man1/ktouch.1.gz
%changelog %changelog