From 3df24969d3dc083619cb71941676f75f0bb34ecf1d43ecae2b9e3aeb7bee2bd6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:16:03 +0000 Subject: [PATCH] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=44 --- kajongg-16.12.3.tar.xz | 3 --- kajongg-17.03.80.tar.xz | 3 +++ kajongg.changes | 44 ++++++++++++++++++++++++--------------- kajongg.spec | 46 +++++++++++++++++++++++++---------------- 4 files changed, 58 insertions(+), 38 deletions(-) delete mode 100644 kajongg-16.12.3.tar.xz create mode 100644 kajongg-17.03.80.tar.xz diff --git a/kajongg-16.12.3.tar.xz b/kajongg-16.12.3.tar.xz deleted file mode 100644 index 136ede6..0000000 --- a/kajongg-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:accc4b1bc857495bc1d9fdc9aa3274f5a2aaf566b49741085640d36b059d9c77 -size 2528552 diff --git a/kajongg-17.03.80.tar.xz b/kajongg-17.03.80.tar.xz new file mode 100644 index 0000000..08fa452 --- /dev/null +++ b/kajongg-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a204bb7cca644636144a1f05acf6874ac25cddf5564d053db9539c18a10f2e56 +size 2527736 diff --git a/kajongg.changes b/kajongg.changes index aa2e5ac..c76b5ab 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:14 CET 2017 - lbeltrame@kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Mar 9 12:35:02 CET 2017 - lbeltrame@kde.org @@ -20,14 +30,14 @@ Thu Feb 9 06:44:19 UTC 2017 - lbeltrame@kde.org Sat Jan 14 08:51:20 UTC 2017 - lbeltrame@kde.org - - Update to KDE Applications 16.12.1 - * KDE Applications 16.12.1 + * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Tue Dec 13 19:32:10 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 + * KDE Applications 16.12.0 * https://www.kde.org/announcements/announce-applications-16.12.0.php @@ -128,7 +138,7 @@ Mon Apr 11 06:32:51 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:35:53 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.3 - * KDE Applications 15.12.3 + * KDE Applications 15.12.3 * https://www.kde.org/announcements/announce-applications-15.12.3.php * boo#970855 @@ -137,7 +147,7 @@ Sun Mar 13 15:35:53 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:03:02 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.2 - * KDE Applications 15.12.2 + * KDE Applications 15.12.2 * https://www.kde.org/announcements/announce-applications-15.12.2.php * boo#966605 @@ -146,7 +156,7 @@ Sat Feb 13 08:03:02 UTC 2016 - tittiatcoke@gmail.com Sat Jan 9 18:11:47 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.1 - * KDE Applications 15.12.1 + * KDE Applications 15.12.1 * https://www.kde.org/announcements/announce-applications-15.12.1.php * boo#961265 @@ -155,7 +165,7 @@ Sat Jan 9 18:11:47 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 13:06:14 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.0 - * KDE Applications 15.12.0 + * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 @@ -164,7 +174,7 @@ Sun Dec 13 13:06:14 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 19:55:10 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.3 - * KDE Applications 15.08.3 + * KDE Applications 15.08.3 * https://www.kde.org/announcements/announce-applications-15.08.3.php * boo#954531 @@ -173,7 +183,7 @@ Tue Nov 10 19:55:10 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:17:29 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.2 - * KDE Applications 15.08.2 + * KDE Applications 15.08.2 * https://www.kde.org/announcements/announce-applications-15.08.2.php @@ -181,7 +191,7 @@ Sun Oct 11 13:17:29 UTC 2015 - tittiatcoke@gmail.com Sun Sep 13 18:58:59 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.1 - * KDE Applications 15.08.1 + * KDE Applications 15.08.1 * https://www.kde.org/announcements/announce-applications-15.08.1.php @@ -492,38 +502,38 @@ Mon Apr 1 19:39:14 UTC 2013 - tittiatcoke@gmail.com Sat Mar 2 16:06:42 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.1 - * Contains bug fixes. See http://www.kde.org/announcements/ - for more information + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information ------------------------------------------------------------------- Thu Jan 31 18:17:25 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.0 - * This is the final release for 4.10. Contains bugfixes + * This is the final release for 4.10. Contains bugfixes ------------------------------------------------------------------- Thu Jan 17 08:37:51 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.98 - * This is the third RC release for 4.10. Contains bugfixes + * This is the third RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Thu Jan 3 21:46:19 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.97 - * This is the second RC release for 4.10. Contains bugfixes + * This is the second RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Wed Dec 19 19:12:08 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.95 - * This is the first RC release for 4.10. Contains bugfixes + * This is the first RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sat Dec 1 20:35:01 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.90 - * This is the second Beta release for 4.10. Contains bugfixes + * This is the second Beta release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sun Nov 25 11:30:33 UTC 2012 - tittiatcoke@gmail.com @@ -536,4 +546,4 @@ Sat Nov 24 13:18:46 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.80 * See http://www.kde.org/announcements/announce-4.10-beta1.php -- Package was split of from kdegames4 +- Package was split of from kdegames4 diff --git a/kajongg.spec b/kajongg.spec index b6866b2..34c4446 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -17,24 +17,32 @@ Name: kajongg -Version: 16.12.3 +Version: 17.03.80 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# 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: 4 Player Mahjongg game License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org Source0: kajongg-%{version}.tar.xz -BuildRequires: libkdegames4-devel -BuildRequires: python-kde4-devel -BuildRequires: python-kdebase4 +BuildRequires: extra-cmake-modules +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5KMahjongglib) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: python3-qt5-devel +BuildRequires: python3-Twisted >= 16.6.0 BuildRequires: xz -Requires: python-kde4 -Requires: python-twisted +BuildRequires: update-desktop-files +Requires: python3-Twisted BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{kde4_runtime_requires} +BuildArch: noarch %description Kajongg is a version of the four player Mahjongg tile game. @@ -43,14 +51,16 @@ Kajongg is a version of the four player Mahjongg tile game. %setup -q -n kajongg-%{version} %build - %cmake_kde4 -d build -- -DINSTALL_KAJONGG=TRUE + # Workaround for kde#376303 + export PYTHONDONTWRITEBYTECODE=1 + export DESTDIR=%{buildroot} + %cmake_kf5 -d build %make_jobs %install cd build -make %{?_smp_mflags} DESTDIR=%{buildroot} install + make %{?_smp_mflags} DESTDIR=%{buildroot} install %suse_update_desktop_file -r org.kde.kajongg Game BoardGame - %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -58,13 +68,13 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_bindir}/kajongg -%{_kde4_bindir}/kajonggserver -%{_kde4_applicationsdir}/org.kde.kajongg.desktop -%{_kde4_htmldir}/en/kajongg/ -%{_kde4_iconsdir}/hicolor/*/apps/kajongg.* -%{_kde4_iconsdir}/hicolor/*/actions/games-kajongg-law.* -%{_kde4_appsdir}/kajongg/ +%{_bindir}/kajongg +%{_bindir}/kajonggserver +%{_kf5_applicationsdir}/org.kde.kajongg.desktop +%{_kf5_htmldir}/en/kajongg/ +%{_kf5_iconsdir}/hicolor/*/apps/kajongg.* +%{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.* +%{_kf5_appsdir}/kajongg/ %{_datadir}/metainfo/ %changelog