Accepting request 516517 from KDE:Applications

Update to 17.08.0

OBS-URL: https://build.opensuse.org/request/show/516517
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kajongg?expand=0&rev=64

fix-i18n.patch

@@ -1,23 +0,0 @@
-Author: Fabian Vogt <fabian@ritter-vogt.de>
-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)

kajongg-17.04.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f8126f6e7ee92d8e9ed81532ce30e7a516f4d9182761c74519522dbf74b9832
-size 4238880

kajongg-17.08.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1a3987ebe0d44579f2ec3bad34b275b9429611aacf244f0d704d754dfb8c159
+size 4238780

kajongg.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+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 :
+  * None
+
+-------------------------------------------------------------------
+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
 

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.04.3
+Version:        17.08.0
 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
+%doc COPYING* README
-%{_bindir}/kajongg
+%doc %lang(en) %{_kf5_htmldir}/en/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/
+%{_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