-updated to 5.56

diff --git a/kf5-qqc2-desktop-style.spec b/kf5-qqc2-desktop-style.spec
index 9dc9de91dc2a6835776efe20688fc3e110291abb..58bcbb9a42d0d5864645636c1e941f17e948828b 100644 (file)
--- a/kf5-qqc2-desktop-style.spec
+++ b/kf5-qqc2-desktop-style.spec
@@ -1,22 +1,23 @@
-%define                kdeframever     5.53
+%define                kdeframever     5.56

 %define                qtver           5.9.0
 %define                kfname          qqc2-desktop-style
 
 Summary:       QQC2StyleBridge
 Name:          kf5-%{kfname}
 %define                qtver           5.9.0
 %define                kfname          qqc2-desktop-style
 
 Summary:       QQC2StyleBridge
 Name:          kf5-%{kfname}

-Version:       5.53.0
+Version:       5.56.0

 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz

-# Source0-md5: b873771ad44ec37625a79d7a41e8679f
+# Source0-md5: 2018e747ed94f81f718ec6147a8562b0

 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Quick-controls2-devel >= %{qtver}
 BuildRequires: Qt5Test-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
 BuildRequires: cmake >= 2.8.12
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Quick-controls2-devel >= %{qtver}
 BuildRequires: Qt5Test-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
 BuildRequires: cmake >= 2.8.12

-BuildRequires: kf5-extra-cmake-modules >= 1.4.0
+BuildRequires: kf5-extra-cmake-modules >= %{version}
+BuildRequires: ninja

 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz


@@ -51,16 +52,14 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
 %build
 install -d build
 cd build

-%cmake \
+%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

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT