- updated to 18.12.1; ninja

diff --git a/ka5-kubrick.spec b/ka5-kubrick.spec
index 3cf7ff5ff25b695553b31d0cb2afe31c7274b055..b47c51f946f32ca70aee35585977257aab3cce67 100644 (file)
--- a/ka5-kubrick.spec
+++ b/ka5-kubrick.spec
@@ -1,15 +1,15 @@
-%define                kdeappsver      18.12.0
+%define                kdeappsver      18.12.1

 %define                qtver           5.9.0
 %define                kaname          kubrick
 Summary:       kubrick
 Summary(pl.UTF-8):     kubrick
 Name:          ka5-%{kaname}
 %define                qtver           5.9.0
 %define                kaname          kubrick
 Summary:       kubrick
 Summary(pl.UTF-8):     kubrick
 Name:          ka5-%{kaname}

-Version:       18.12.0
+Version:       18.12.1

 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz

-# Source0-md5: 0fb5ecf5f0b4b728f284eb5b28c26c47
+# Source0-md5: 306de7e0c19966b36141f6fd26058bdb

 URL:           http://www.kde.org/
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel
 URL:           http://www.kde.org/
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel


@@ -20,7 +20,7 @@ BuildRequires:        Qt5Quick-devel >= 5.11.1
 BuildRequires: Qt5Svg-devel
 BuildRequires: Qt5Widgets-devel
 BuildRequires: gettext-devel
 BuildRequires: Qt5Svg-devel
 BuildRequires: Qt5Widgets-devel
 BuildRequires: gettext-devel

-BuildRequires: ka5-libkdegames-devel >= 18.12.0
+BuildRequires: ka5-libkdegames-devel >= %{kdeappsver}

 BuildRequires: kf5-extra-cmake-modules >= 5.30.0
 BuildRequires: kf5-kconfig-devel >= 5.30.0
 BuildRequires: kf5-kconfigwidgets-devel >= 5.30.0
 BuildRequires: kf5-extra-cmake-modules >= 5.30.0
 BuildRequires: kf5-kconfig-devel >= 5.30.0
 BuildRequires: kf5-kconfigwidgets-devel >= 5.30.0


@@ -31,6 +31,7 @@ BuildRequires:        kf5-ki18n-devel >= 5.30.0
 BuildRequires: kf5-kio-devel >= 5.30.0
 BuildRequires: kf5-kwidgetsaddons-devel >= 5.30.0
 BuildRequires: kf5-kxmlgui-devel >= 5.30.0
 BuildRequires: kf5-kio-devel >= 5.30.0
 BuildRequires: kf5-kwidgetsaddons-devel >= 5.30.0
 BuildRequires: kf5-kxmlgui-devel >= 5.30.0

+BuildRequires: ninja

 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -49,14 +50,14 @@ puzzles.
 install -d build
 cd build
 %cmake \
 install -d build
 cd build
 %cmake \

+       -G Ninja \

        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        ..
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        ..

-%{__make}
+%ninja_build

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-%{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build

 
 %find_lang %{kaname} --all-name --with-kde
 
 
 %find_lang %{kaname} --all-name --with-kde