Accepting request 490366 from KDE:Applications

KDE Applications 17.04.0 final

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

fix-i18n.patch

@@ -0,0 +1,23 @@
+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-16.12.3.tar.xz

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

kajongg-17.04.0.tar.xz

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

kajongg.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sun Apr 16 10:44:49 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.04.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-17.04.0.php
+- Changes since 17.03.90:
+  * None
+
+-------------------------------------------------------------------
+Wed Apr 12 20:25:19 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.03.90
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-17.04-rc.php
+- Changes since 17.03.80:
+  * None
+- Add patch to fix build:
+  * fix-i18n.patch
+
+-------------------------------------------------------------------
+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
 

kajongg.spec

@@ -15,42 +15,66 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%bcond_without lang
 
 Name:           kajongg
-Version:        16.12.3
+Version:        17.04.0
 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
+# PATCH-FIX-UPSTREAM (I hope)
-BuildRequires:  python-kde4-devel
+Patch1:         fix-i18n.patch
-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(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
-Requires:       python-kde4
+BuildRequires:  update-desktop-files
-Requires:       python-twisted
+Requires:       python3-Twisted
+Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{kde4_runtime_requires}
+BuildArch:      noarch
 
 %description
 Kajongg is a version of the four player Mahjongg tile game.
 
+%if %{with lang}
+%lang_package
+%endif
+
 %prep
 %setup -q -n kajongg-%{version}
+%patch1 -p1
 
 %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_install -C build
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+  %if %{with lang}
+    %find_lang %{name} --with-man --all-name
+    %kf5_find_htmldocs
+  %endif
   %suse_update_desktop_file -r org.kde.kajongg         Game BoardGame
-  %kde_post_install
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -58,13 +82,18 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install
 %files
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
-%{_kde4_bindir}/kajongg
+%{_bindir}/kajongg
-%{_kde4_bindir}/kajonggserver
+%{_bindir}/kajonggserver
-%{_kde4_applicationsdir}/org.kde.kajongg.desktop
+%{_kf5_applicationsdir}/org.kde.kajongg.desktop
-%{_kde4_htmldir}/en/kajongg/
+%{_kf5_htmldir}/en/kajongg/
-%{_kde4_iconsdir}/hicolor/*/apps/kajongg.*
+%{_kf5_iconsdir}/hicolor/*/apps/kajongg.*
-%{_kde4_iconsdir}/hicolor/*/actions/games-kajongg-law.*
+%{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.*
-%{_kde4_appsdir}/kajongg/
+%{_kf5_appsdir}/kajongg/
 %{_datadir}/metainfo/
 
+%if %{with lang}
+%files lang -f %{name}.lang
+%doc COPYING*
+%endif
+
 %changelog