From 9256276925bb8140a7b52938b1305aba1e9dc65dcffa9601a8ccaab73fbcc37a Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sat, 21 Nov 2020 12:57:47 +0000
Subject: [PATCH] 20.12 beta

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kajongg?expand=0&rev=128
---
 kajongg-20.08.3.tar.xz      |  3 ---
 kajongg-20.08.3.tar.xz.sig  | 11 -----------
 kajongg-20.11.80.tar.xz     |  3 +++
 kajongg-20.11.80.tar.xz.sig | 16 ++++++++++++++++
 kajongg.changes             |  9 +++++++++
 kajongg.spec                | 30 ++++++++++++++++--------------
 6 files changed, 44 insertions(+), 28 deletions(-)
 delete mode 100644 kajongg-20.08.3.tar.xz
 delete mode 100644 kajongg-20.08.3.tar.xz.sig
 create mode 100644 kajongg-20.11.80.tar.xz
 create mode 100644 kajongg-20.11.80.tar.xz.sig

diff --git a/kajongg-20.08.3.tar.xz b/kajongg-20.08.3.tar.xz
deleted file mode 100644
index ab967f8..0000000
--- a/kajongg-20.08.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea3ae7d5314351724a843e8d06eda36326d66ea3f92d09fc1e00878a7b212073
-size 4475032
diff --git a/kajongg-20.08.3.tar.xz.sig b/kajongg-20.08.3.tar.xz.sig
deleted file mode 100644
index cfcba43..0000000
--- a/kajongg-20.08.3.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqjAACgkQ29LOiT4t
-HIflwQgAlUjOIy4YSw5QKdvXxyym7Knx01CeeqHosAPFwpvsX6+tCRUQBa19cOqs
-tseZ30DFMfBmwsGGbEjK6HAwEYLGS4OHgC16KqF26EOGjM34R474g92zSlHcuhIC
-C3WKutJwu8oPq7xOjuYXonOWlUtjbC74A9rmWGpZXmycdyLMH9F9QoJKsKBR3615
-RWXCkWwv2Mhb28Jvwp/OTkN2XpK/FL7NYivoHqClyLamsIu1FLcZLRJ9hzzvpUNN
-toVLIqzqs+qF7obYe/VKL6+dVc1jCiCghKRzTvm/MBqcbhqUiQtrHTfPwLOaw78A
-B/ToytqbVylW0qUtiZoVJPdnWARmeg==
-=abja
------END PGP SIGNATURE-----
diff --git a/kajongg-20.11.80.tar.xz b/kajongg-20.11.80.tar.xz
new file mode 100644
index 0000000..b9471a3
--- /dev/null
+++ b/kajongg-20.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d48102a9ada742f957164653fa57e2eef020b2caaa8eefe8d3832e6a7a6ef6b
+size 4471652
diff --git a/kajongg-20.11.80.tar.xz.sig b/kajongg-20.11.80.tar.xz.sig
new file mode 100644
index 0000000..575c6ea
--- /dev/null
+++ b/kajongg-20.11.80.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uomcACgkQOmpNuDnq
+ptdfEQ/9HKuGBTuMnEdvsQN+cHIk0idrCLoVlM2lG0PV5R6yq30lyP1WeCKlW0Lf
+nLaowcQI56WnDeCfEUy44Ldy4uyLWfMHAcQJQzIX2TCseNESEhAuE4Xlr5U5Euv7
+WoxCA8pI0P7JlOj0MTk3p32YVJU3R35W18+jGlSgS+pgZfkDnx8mNqxk5qpzKMHq
+vxE/HX8sPz5+hDbh7UDxPp2P7HNcyINQO4s7iWP4nskwwSLEbSdB0ybzQvzbz9G7
+NWWHNxVH342gpP1folbER5KY34ztJuA/Y0Cme7E8hkcvvbKVEvA0yb0b8ZWp6/UB
+D3mvl2LbkEj6h6jCr6ye3zykd+gqcG/TDuElxpt9R2IU2LwBuV37P7SIYI+6y/IJ
+gmQ3lVSiSH3HLlNWuDxQax1SM9QutXXpM8k+2lznzTNifwrNnX0ai2QxKqqhUdZR
+SE40SRb0S27ZzBh31fIWZtbIKQHfIVlK0nHFCF1SzRnjEIhcYV4W5GAPTF9VFExJ
+LrDvqkFeuo6XAxQ07IrOK+bVvoDoT8FEe6iwiFIYF66mRik7Sdb6FooOXOudLTsV
+SQVd0S5os+YnFskVaQKJx8RCX1fdWJlGIxgGBjnzcet99vA720G6SFgb2vu7EyQC
+4gWcqX4PJY+u6/ObcX7/xKwqgCGIUN+cIHfFyjR2vOO5S3/rnO4=
+=i3qV
+-----END PGP SIGNATURE-----
diff --git a/kajongg.changes b/kajongg.changes
index 94476c5..f49b510 100644
--- a/kajongg.changes
+++ b/kajongg.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov 14 00:00:48 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.11.80
+  * New feature release
+- Changes since 20.08.3:
+  * Move de voices from svn here
+  * Use ${KF5_...}
+
 -------------------------------------------------------------------
 Thu Nov  5 22:45:40 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kajongg.spec b/kajongg.spec
index 05f9384..b7361d1 100644
--- a/kajongg.spec
+++ b/kajongg.spec
@@ -21,13 +21,13 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kajongg
-Version:        20.08.3
+Version:        20.11.80
 Release:        0
 Summary:        4 Player Mahjongg game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Board/Puzzle
 URL:            https://www.kde.org
-Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
 BuildRequires:  extra-cmake-modules
 BuildRequires:  python3-Twisted >= 16.6.0
 BuildRequires:  python3-base >= 3.5.0
@@ -47,7 +47,7 @@ Requires:       python3-Twisted
 Requires:       python3-qt5
 BuildArch:      noarch
 %if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif
 Recommends:     %{name}-lang
@@ -61,19 +61,20 @@ Kajongg is a version of the four player Mahjongg tile game.
 %setup -q -n kajongg-%{version}
 
 %build
-  # Workaround for kde#376303
-  export PYTHONDONTWRITEBYTECODE=1
-  export DESTDIR=%{buildroot}
-  %cmake_kf5 -d build
-  %cmake_build
+# Workaround for kde#376303
+export PYTHONDONTWRITEBYTECODE=1
+export DESTDIR=%{buildroot}
+%cmake_kf5 -d build
+%cmake_build
 
 %install
-  %make_install -C build
-  %if %{with lang}
-    %find_lang %{name} --with-man --all-name
-    %{kf5_find_htmldocs}
-  %endif
-  %suse_update_desktop_file -r org.kde.kajongg         Game BoardGame
+%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.kajongg         Game BoardGame
 
 %files
 %license COPYING*
@@ -86,6 +87,7 @@ Kajongg is a version of the four player Mahjongg tile game.
 %{_kf5_bindir}/kajonggserver
 %{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.*
 %{_kf5_iconsdir}/hicolor/*/apps/kajongg.*
+
 %if %{with lang}
 %files lang -f %{name}.lang
 %license COPYING*