diff --git a/fix-i18n.patch b/fix-i18n.patch new file mode 100644 index 0000000..efeeb36 --- /dev/null +++ b/fix-i18n.patch @@ -0,0 +1,23 @@ +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 390ec85..6ed818b 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -7,6 +7,8 @@ Wed Apr 12 20:25:19 CEST 2017 - lbeltrame@kde.org * 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 diff --git a/kajongg.spec b/kajongg.spec index 65e611d..9cfc9c5 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: kajongg Version: 17.03.90 @@ -27,6 +28,8 @@ 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: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) @@ -34,8 +37,10 @@ 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 @@ -47,8 +52,13 @@ 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 # Workaround for kde#376303 @@ -58,8 +68,11 @@ Kajongg is a version of the four player Mahjongg tile game. %make_jobs %install - cd build - make %{?_smp_mflags} DESTDIR=%{buildroot} 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 %post -p /sbin/ldconfig @@ -77,4 +90,9 @@ Kajongg is a version of the four player Mahjongg tile game. %{_kf5_appsdir}/kajongg/ %{_datadir}/metainfo/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog