From 9547f531754ba42c58a89b0c97720ca2a49e35855a31501dd04deeccd193a2e4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:27:16 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=52 --- kubrick-17.04.3.tar.xz | 3 --- kubrick-17.07.90.tar.xz | 3 +++ kubrick.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 kubrick-17.04.3.tar.xz create mode 100644 kubrick-17.07.90.tar.xz diff --git a/kubrick-17.04.3.tar.xz b/kubrick-17.04.3.tar.xz deleted file mode 100644 index 4a8c611..0000000 --- a/kubrick-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a9783178bf2008e37b69a6870a7bb1eafb6a7d43715a6303861e975a8e672fe -size 107000 diff --git a/kubrick-17.07.90.tar.xz b/kubrick-17.07.90.tar.xz new file mode 100644 index 0000000..071dd0e --- /dev/null +++ b/kubrick-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a0b328646acfa3ecf94901725f6fdcfc764422c5d05e81ffe342f6150d752e9 +size 308732 diff --git a/kubrick.changes b/kubrick.changes index eb15148..7be2ed3 100644 --- a/kubrick.changes +++ b/kubrick.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:19:10 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 d402e4298ad00ea5a97aeec06a20fc6a4ac15599757ccafdceeda2660fe8d5e1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:53:08 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=53 --- kubrick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubrick.spec b/kubrick.spec index a9dfc52..36f5508 100644 --- a/kubrick.spec +++ b/kubrick.spec @@ -24,7 +24,7 @@ Summary: Kubrick is a game based on Rubik's Cube License: GPL-2.0+ Group: Amusements/Games/Logic Url: http://www.kde.org -Version: 17.04.3 +Version: 17.07.90 Release: 0 Source0: kubrick-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build From df3c298505f4246071cf6710271f4d5b52ce1689394bff9827205e02c04bba50 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 22:24:16 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=54 --- kubrick.spec | 68 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/kubrick.spec b/kubrick.spec index 36f5508..4c58abc 100644 --- a/kubrick.spec +++ b/kubrick.spec @@ -1,7 +1,7 @@ # # spec file for package kubrick # -# 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 @@ -14,46 +14,78 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%bcond_without lang Name: kubrick -BuildRequires: libkdegames4-devel -BuildRequires: xz -BuildRequires: pkgconfig(glu) +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: Kubrick is a game based on Rubik's Cube License: GPL-2.0+ Group: Amusements/Games/Logic Url: http://www.kde.org -Version: 17.07.90 -Release: 0 Source0: kubrick-%{version}.tar.xz +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkdegames-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(glu) +Obsoletes: kubrick5 < %{version} +Provides: kubrick5 = %{version} +%if %{with lang} +Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description This package contains the KDE game Kubrick which is based on Rubik's Cube. +%if %{with lang} +%lang_package +%endif %prep -%setup -q -n kubrick-%{version} +%setup -q %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %kde_post_install + %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kubrick -%{_kde4_htmldir}/en/kubrick/ -%{_kde4_applicationsdir}/kubrick.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kubrick.* -%{_kde4_appsdir}/kubrick/ +%{_datadir}/kubrick/ +%{_datadir}/kxmlgui5/kubrick/ +%{_kf5_applicationsdir}/org.kde.kubrick.desktop +%{_kf5_appstreamdir}/org.kde.kubrick.appdata.xml +%{_kf5_bindir}/kubrick +%{_kf5_htmldir}/en/kubrick/ +%{_kf5_iconsdir}/hicolor/*/*/kubrick* + +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif %changelog From c390aedf2037105cb04d8c2ac1b76c599f8179057b6456cd1b2eb3f6f0c66487 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 22:30:20 +0000 Subject: [PATCH 4/6] rpmlint OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=55 --- kubrick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubrick.spec b/kubrick.spec index 4c58abc..9c04c1d 100644 --- a/kubrick.spec +++ b/kubrick.spec @@ -22,7 +22,7 @@ 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: Kubrick is a game based on Rubik's Cube +Summary: Game based on Rubik's Cube License: GPL-2.0+ Group: Amusements/Games/Logic Url: http://www.kde.org From 9c98ea7c0e83acedca0dd182545002fb3d29db967a08bf208239178f4295ae4d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:00:01 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=56 --- kubrick.changes | 9 +++++++++ kubrick.spec | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/kubrick.changes b/kubrick.changes index 7be2ed3..2afa51e 100644 --- a/kubrick.changes +++ b/kubrick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:46:13 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:10 UTC 2017 - christophe@krop.fr diff --git a/kubrick.spec b/kubrick.spec index 9c04c1d..32c82b2 100644 --- a/kubrick.spec +++ b/kubrick.spec @@ -14,13 +14,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + %bcond_without lang Name: kubrick 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: Game based on Rubik's Cube License: GPL-2.0+ @@ -75,13 +77,13 @@ Cube. %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_datadir}/kubrick/ -%{_datadir}/kxmlgui5/kubrick/ +%doc %lang(en) %{_kf5_htmldir}/en/kubrick/ %{_kf5_applicationsdir}/org.kde.kubrick.desktop %{_kf5_appstreamdir}/org.kde.kubrick.appdata.xml %{_kf5_bindir}/kubrick -%{_kf5_htmldir}/en/kubrick/ %{_kf5_iconsdir}/hicolor/*/*/kubrick* +%{_kf5_kxmlguidir}/kubrick/ +%{_kf5_sharedir}/kubrick/ %if %{with lang} %files lang -f %{name}.lang From 5055c96b010f4e4d4e8cba63a35c07876f0525ddfe363e5f87aadd6afa889ee9 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:15:52 +0000 Subject: [PATCH 6/6] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kubrick?expand=0&rev=57 --- kubrick-17.07.90.tar.xz | 3 --- kubrick-17.08.0.tar.xz | 3 +++ kubrick.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kubrick-17.07.90.tar.xz create mode 100644 kubrick-17.08.0.tar.xz diff --git a/kubrick-17.07.90.tar.xz b/kubrick-17.07.90.tar.xz deleted file mode 100644 index 071dd0e..0000000 --- a/kubrick-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a0b328646acfa3ecf94901725f6fdcfc764422c5d05e81ffe342f6150d752e9 -size 308732 diff --git a/kubrick-17.08.0.tar.xz b/kubrick-17.08.0.tar.xz new file mode 100644 index 0000000..1bdf129 --- /dev/null +++ b/kubrick-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:111210f83d701f858cea3670bd8fb132d1611ede796e78866397f16e46f1ffab +size 306296 diff --git a/kubrick.spec b/kubrick.spec index 32c82b2..cae7403 100644 --- a/kubrick.spec +++ b/kubrick.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: kubrick -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)