From 05629d48a2f7d447a28352f81bb56aaf9baa72a1ccca6555cec1f26108967def Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:23:15 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=55 --- kajongg-17.04.3.tar.xz | 3 --- kajongg-17.07.90.tar.xz | 3 +++ kajongg.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 kajongg-17.04.3.tar.xz create mode 100644 kajongg-17.07.90.tar.xz diff --git a/kajongg-17.04.3.tar.xz b/kajongg-17.04.3.tar.xz deleted file mode 100644 index 9ba61b3..0000000 --- a/kajongg-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f8126f6e7ee92d8e9ed81532ce30e7a516f4d9182761c74519522dbf74b9832 -size 4238880 diff --git a/kajongg-17.07.90.tar.xz b/kajongg-17.07.90.tar.xz new file mode 100644 index 0000000..4b28ee1 --- /dev/null +++ b/kajongg-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99dbd5b358a8f92668728d9e38683642353fa104437fb098fbddaf9b31767443 +size 4238752 diff --git a/kajongg.changes b/kajongg.changes index 7176e22..cfb312b 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:16:58 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 + + ------------------------------------------------------------------- Sat Jul 15 22:59:08 CEST 2017 - lbeltrame@kde.org From 7ee812a9b1e3ee299ce99ddfb6cc7c3a532f7162ab3a4265c6387b447cdfa67d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:49:16 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=56 --- kajongg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kajongg.spec b/kajongg.spec index 3168200..039d427 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kajongg -Version: 17.04.3 +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) From 5573ee12f80de904f6754053b3a8ef083a471aa751316c7433c5982b4e0c5ac5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 22:53:44 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=57 --- fix-i18n.patch | 23 ----------------------- kajongg.changes | 10 +++++++++- kajongg.spec | 46 +++++++++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 fix-i18n.patch diff --git a/fix-i18n.patch b/fix-i18n.patch deleted file mode 100644 index efeeb36..0000000 --- a/fix-i18n.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Fabian Vogt -Subject: Fix i18n call - -The call to ki18n_install was autogenerated by a script, but -it requires I18n to be available. - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: kajongg-17.03.90/CMakeLists.txt -=================================================================== ---- kajongg-17.03.90.orig/CMakeLists.txt -+++ kajongg-17.03.90/CMakeLists.txt -@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SO - find_package(PythonInterp ${PYTHON_MIN_VERSION} REQUIRED) - find_package(Twisted ${TWISTED_MIN_VERSION} REQUIRED) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg Widgets) --find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools) -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n) - - include(FeatureSummary) - include(ECMPackageConfigHelpers) diff --git a/kajongg.changes b/kajongg.changes index cfb312b..0630217 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -1,10 +1,18 @@ +------------------------------------------------------------------- +Fri Aug 11 22:45:03 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 : + ------------------------------------------------------------------- Sat Aug 5 18:16:58 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 - +- Drop fix-i18n.patch (no longer needed) ------------------------------------------------------------------- Sat Jul 15 22:59:08 CEST 2017 - lbeltrame@kde.org diff --git a/kajongg.spec b/kajongg.spec index 039d427..25acbec 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -1,7 +1,7 @@ # # spec file for package kajongg # -# Copyright (c) 2016 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 @@ -15,38 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kajongg 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: 4 Player Mahjongg game License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org Source0: kajongg-%{version}.tar.xz -# PATCH-FIX-UPSTREAM (I hope) -Patch1: fix-i18n.patch BuildRequires: extra-cmake-modules +BuildRequires: python3-Twisted >= 16.6.0 +BuildRequires: python3-base >= 3.5.0 +BuildRequires: python3-qt5-devel +BuildRequires: update-desktop-files +BuildRequires: xz +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KMahjongglib) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KMahjongglib) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: python3-base >= 3.5.0 -BuildRequires: python3-qt5-devel -BuildRequires: python3-Twisted >= 16.6.0 -BuildRequires: xz -BuildRequires: update-desktop-files Requires: python3-Twisted +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,7 +60,6 @@ Kajongg is a version of the four player Mahjongg tile game. %prep %setup -q -n kajongg-%{version} -%patch1 -p1 %build # Workaround for kde#376303 @@ -81,17 +81,17 @@ Kajongg is a version of the four player Mahjongg tile game. %files %defattr(-,root,root) -%doc COPYING COPYING.DOC README -%{_bindir}/kajongg -%{_bindir}/kajonggserver +%doc COPYING* README +%doc %lang(en) %{_kf5_htmldir}/en/kajongg/ %{_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/ - +%{_kf5_appstreamdir}/ +%{_kf5_bindir}/kajongg +%{_kf5_bindir}/kajonggserver +%{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.* +%{_kf5_iconsdir}/hicolor/*/apps/kajongg.* %if %{with lang} + %files lang -f %{name}.lang %doc COPYING* %endif From cea2985ec9818a8a28dc0b379276ac5df4a10aaa96b1023e331587cdf9b5a345 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:09:03 +0000 Subject: [PATCH 4/5] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=58 --- kajongg-17.07.90.tar.xz | 3 --- kajongg-17.08.0.tar.xz | 3 +++ kajongg.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kajongg-17.07.90.tar.xz create mode 100644 kajongg-17.08.0.tar.xz diff --git a/kajongg-17.07.90.tar.xz b/kajongg-17.07.90.tar.xz deleted file mode 100644 index 4b28ee1..0000000 --- a/kajongg-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99dbd5b358a8f92668728d9e38683642353fa104437fb098fbddaf9b31767443 -size 4238752 diff --git a/kajongg-17.08.0.tar.xz b/kajongg-17.08.0.tar.xz new file mode 100644 index 0000000..305b76a --- /dev/null +++ b/kajongg-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1a3987ebe0d44579f2ec3bad34b275b9429611aacf244f0d704d754dfb8c159 +size 4238780 diff --git a/kajongg.spec b/kajongg.spec index 25acbec..7a46bf1 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: kajongg -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 82aca4bdf7897d279fe2504bf73febb623319a88d2435e6fc15fb5d6325dcde5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 12 Aug 2017 10:55:20 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=59 --- kajongg.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kajongg.changes b/kajongg.changes index 0630217..932857d 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -5,6 +5,7 @@ Fri Aug 11 22:45:03 UTC 2017 - christophe@krop.fr * New feature release * https://www.kde.org/announcements/announce-applications-17.08.0.php - Changes since 17.04.3 : + * None ------------------------------------------------------------------- Sat Aug 5 18:16:58 UTC 2017 - christophe@krop.fr