From 124a2ba2940e0cdc33f3ba49774ecc6e43ad1cd3b9e10d5482b12f19bcaec2c3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:27:58 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=52 --- lskat-17.04.3.tar.xz | 3 --- lskat-17.07.90.tar.xz | 3 +++ lskat.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 lskat-17.04.3.tar.xz create mode 100644 lskat-17.07.90.tar.xz diff --git a/lskat-17.04.3.tar.xz b/lskat-17.04.3.tar.xz deleted file mode 100644 index aa7f11a..0000000 --- a/lskat-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1883df402801570eaede66eb61730f486ab95ddbee572d27c8116015ca72f9af -size 927004 diff --git a/lskat-17.07.90.tar.xz b/lskat-17.07.90.tar.xz new file mode 100644 index 0000000..e2d7a61 --- /dev/null +++ b/lskat-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3150d062dcd0e9151ef38363da5856e0f59dd26927848bf61a7595fb6246cad3 +size 1216288 diff --git a/lskat.changes b/lskat.changes index 8bb629d..f1ca057 100644 --- a/lskat.changes +++ b/lskat.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:19:31 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + ------------------------------------------------------------------- Mon Jul 17 07:13:07 CEST 2017 - lbeltrame@kde.org From d7fee4dcb695d4021f47df8ef554dcdbd4ab6cea03d2a4bde473e2d10abcf323 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:53:42 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=53 --- lskat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lskat.spec b/lskat.spec index 9b0ff99..b149f0a 100644 --- a/lskat.spec +++ b/lskat.spec @@ -23,7 +23,7 @@ Summary: German Skat game License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 17.04.3 +Version: 17.07.90 Release: 0 Source0: lskat-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build From ed10e054ac935439517ce56ec5c7f73696418bde5c88c57669c3201f8133fbc0 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 22:17:48 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=54 --- lskat.spec | 66 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/lskat.spec b/lskat.spec index b149f0a..6e2e1d2 100644 --- a/lskat.spec +++ b/lskat.spec @@ -1,7 +1,7 @@ # # spec file for package lskat # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,18 +17,44 @@ Name: lskat -BuildRequires: libkdegames4-devel -BuildRequires: xz +Version: 17.07.90 +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: German Skat game License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 17.07.90 -Release: 0 Source0: lskat-%{version}.tar.xz +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kdoctools-devel +BuildRequires: kguiaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: kitemviews-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkdegames-devel +BuildRequires: phonon4qt5-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +Requires: kdegames-carddecks-default +Obsoletes: lskat5 < %{version} +Provides: lskat5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kdegames4-carddecks-default -%kde4_runtime_requires %description Lieutenant Skat is a nice two player card game which follows the rules @@ -36,30 +62,26 @@ for the German game (Offiziers)-Skat. The program includes many different carddecks to choose. A computer opponent can play for any of the players. - %prep -%setup -q -n lskat-%{version} +%setup -q %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %makeinstall - %suse_update_desktop_file -r lskat Game CardGame - %kde_post_install - -%clean - rm -rf $RPM_BUILD_ROOT + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.lskat Game CardGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/lskat -%{_kde4_htmldir}/en/lskat/ -%{_kde4_applicationsdir}/lskat.desktop -%{_kde4_iconsdir}/hicolor/*/apps/lskat.* -%{_kde4_appsdir}/lskat/ +%{_kf5_applicationsdir}/org.kde.lskat.desktop +%{_kf5_appsdir}/lskat/ +%{_kf5_appstreamdir}/org.kde.lskat.appdata.xml +%{_kf5_bindir}/lskat +%{_kf5_htmldir}/en/lskat/ +%{_kf5_iconsdir}/hicolor/*/apps/lskat.* +%{_kf5_kxmlguidir}/lskat/ %changelog From 615be4e5696ff7ba71a0346d8346161ecde54bbd80f51b8c7114960b57d72841 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 22:22:01 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=55 --- lskat.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lskat.spec b/lskat.spec index 6e2e1d2..57acbeb 100644 --- a/lskat.spec +++ b/lskat.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: lskat Version: 17.07.90 @@ -54,6 +55,7 @@ BuildRequires: pkgconfig(Qt5Widgets) Requires: kdegames-carddecks-default Obsoletes: lskat5 < %{version} Provides: lskat5 = %{version} +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +64,10 @@ for the German game (Offiziers)-Skat. The program includes many different carddecks to choose. A computer opponent can play for any of the players. +%if %{with lang} +%lang_package +%endif + %prep %setup -q @@ -71,6 +77,10 @@ the players. %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif %suse_update_desktop_file -r org.kde.lskat Game CardGame %files @@ -84,4 +94,9 @@ the players. %{_kf5_iconsdir}/hicolor/*/apps/lskat.* %{_kf5_kxmlguidir}/lskat/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From 2bfab9504bdf9d9f1e8716b5ebfe0f393d54ee73cc4ed5d3ab00dad8a27830c8 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:01:12 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=56 --- lskat.changes | 9 +++++++++ lskat.spec | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lskat.changes b/lskat.changes index f1ca057..b2c9438 100644 --- a/lskat.changes +++ b/lskat.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:46:25 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : +- Too many changes to list here + ------------------------------------------------------------------- Sat Aug 5 18:19:31 UTC 2017 - christophe@krop.fr diff --git a/lskat.spec b/lskat.spec index 57acbeb..fda34e9 100644 --- a/lskat.spec +++ b/lskat.spec @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: lskat Version: 17.07.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. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: German Skat game License: GPL-2.0+ @@ -55,7 +56,9 @@ BuildRequires: pkgconfig(Qt5Widgets) Requires: kdegames-carddecks-default Obsoletes: lskat5 < %{version} Provides: lskat5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -85,12 +88,12 @@ the players. %files %defattr(-,root,root) -%doc COPYING COPYING.DOC +%doc COPYING* README +%doc %lang(en) %{_kf5_htmldir}/en/lskat/ %{_kf5_applicationsdir}/org.kde.lskat.desktop %{_kf5_appsdir}/lskat/ %{_kf5_appstreamdir}/org.kde.lskat.appdata.xml %{_kf5_bindir}/lskat -%{_kf5_htmldir}/en/lskat/ %{_kf5_iconsdir}/hicolor/*/apps/lskat.* %{_kf5_kxmlguidir}/lskat/ From c202147958da14f2aeaffddc0908215243a929fda7b915a469e1c4f32733f991 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:17:18 +0000 Subject: [PATCH 6/7] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=57 --- lskat-17.07.90.tar.xz | 3 --- lskat-17.08.0.tar.xz | 3 +++ lskat.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lskat-17.07.90.tar.xz create mode 100644 lskat-17.08.0.tar.xz diff --git a/lskat-17.07.90.tar.xz b/lskat-17.07.90.tar.xz deleted file mode 100644 index e2d7a61..0000000 --- a/lskat-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3150d062dcd0e9151ef38363da5856e0f59dd26927848bf61a7595fb6246cad3 -size 1216288 diff --git a/lskat-17.08.0.tar.xz b/lskat-17.08.0.tar.xz new file mode 100644 index 0000000..2d0bccf --- /dev/null +++ b/lskat-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cad8412463cece649a465ad420cd49473719b2cabb4e12ab65acbb49a5f38b77 +size 1215848 diff --git a/lskat.spec b/lskat.spec index fda34e9..d3a649d 100644 --- a/lskat.spec +++ b/lskat.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: lskat -Version: 17.07.90 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) From 959f4613391a7320f7535ec66661cbc8d470c4cd31b98582ce90d1058cb47079 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 16 Aug 2017 17:09:20 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/lskat?expand=0&rev=58 --- lskat.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lskat.spec b/lskat.spec index d3a649d..7a3ab5b 100644 --- a/lskat.spec +++ b/lskat.spec @@ -30,19 +30,14 @@ Group: Amusements/Games/Board/Card Url: http://www.kde.org Source0: lskat-%{version}.tar.xz BuildRequires: extra-cmake-modules -BuildRequires: karchive-devel BuildRequires: kconfig-devel BuildRequires: kconfigwidgets-devel BuildRequires: kcoreaddons-devel -BuildRequires: kdelibs4support-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel BuildRequires: kdoctools-devel BuildRequires: kguiaddons-devel BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kitemviews-devel -BuildRequires: knewstuff-devel -BuildRequires: knotifyconfig-devel BuildRequires: kwidgetsaddons-devel BuildRequires: kxmlgui-devel BuildRequires: libkdegames-devel