From d82ae7ee7644e748e263f16614622985ab75dac6 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 12 Jan 2019 20:10:13 +0100 Subject: [PATCH] - updated to 18.12.1; ninja --- ka5-kblog.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ka5-kblog.spec b/ka5-kblog.spec index b882e99..ea7c0db 100644 --- a/ka5-kblog.spec +++ b/ka5-kblog.spec @@ -1,27 +1,28 @@ -%define kdeappsver 18.12.0 +%define kdeappsver 18.12.1 %define qtver 5.9.0 %define kaname kblog Summary: Kblog Name: ka5-%{kaname} -Version: 18.12.0 +Version: 18.12.1 Release: 1 License: GPL v2+/LGPL v2.1+ Group: X11/Libraries Source0: http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz -# Source0-md5: b7dd0e3de1bb4d1521c7af55f29a8d76 +# Source0-md5: 2987d10da2921d1c4a5a17d42015bc70 URL: http://www.kde.org/ BuildRequires: Qt5Core-devel >= %{qtver} BuildRequires: Qt5Gui-devel >= 5.11.1 BuildRequires: Qt5Test-devel BuildRequires: cmake >= 2.8.12 BuildRequires: gettext-devel -BuildRequires: ka5-kcalcore-devel >= 18.12.0 +BuildRequires: ka5-kcalcore-devel >= %{kdeappsver} BuildRequires: kf5-extra-cmake-modules >= 5.53.0 BuildRequires: kf5-kcoreaddons-devel >= 5.51.0 BuildRequires: kf5-ki18n-devel >= 5.51.0 BuildRequires: kf5-kio-devel >= 5.51.0 BuildRequires: kf5-kxmlrpcclient-devel >= 5.53.0 BuildRequires: kf5-syndication-devel >= 5.53.0 +BuildRequires: ninja BuildRequires: qt5-build >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.164 BuildRequires: shared-mime-info @@ -56,14 +57,14 @@ Pliki nagłówkowe dla programistów używających %{kaname}. install -d build cd build %cmake \ + -G Ninja \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ .. -%{__make} +%ninja_build %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 @@ -78,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT /etc/xdg/kblog.categories /etc/xdg/kblog.renamecategories %attr(755,root,root) %ghost %{_libdir}/libKF5Blog.so.5 -%attr(755,root,root) %{_libdir}/libKF5Blog.so.5.10.0 +%attr(755,root,root) %{_libdir}/libKF5Blog.so.5.*.* %files devel %defattr(644,root,root,755) -- 2.43.0