- up to 5.4.0

diff --git a/kf5-kcoreaddons.spec b/kf5-kcoreaddons.spec
index 6e06f79f287ff978a772866cabf77cbf1f24db17..c7188c77e43f7e61cb583d41412e50850927531e 100644 (file)
--- a/kf5-kcoreaddons.spec
+++ b/kf5-kcoreaddons.spec
@@ -1,34 +1,34 @@
 # TODO:
-# - proper place for *.pri,
-# - set ECM_MKSPECS_INSTALL_DIR in kde5-extra-cmake-modules
 # - runtime Requires if any
 # - dir /usr/include/KF5 not packaged
-%define         _state          stable
+
+%bcond_without tests
+
 %define                orgname         kcoreaddons
+%define                kdeframever     5.4
+%define                qt_ver          5.3.2
 
 Summary:       Utilities for core application functionality and accessing the OS
 Name:          kf5-%{orgname}
-Version:       5.0.0
-Release:       0.1
+Version:       5.4.0
+Release:       1
 License:       GPL v2+/LGPL v2.1+
 Group:         X11/Libraries
-Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/frameworks/%{version}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 90dcfc98dbb0c55981370e264fb6f21f
+Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5: 4946f5145126de7bf293c3140194e966
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel >= 5.2.0
-BuildRequires: Qt5Test-devel
+BuildRequires: Qt5Core-devel >= %{qt_ver}
+BuildRequires: Qt5Test-devel >= %{qt_ver}
 BuildRequires: cmake >= 2.8.12
 BuildRequires: fam-devel
-BuildRequires: kf5-extra-cmake-modules >= 1.0.0
-BuildRequires: qt5-linguist
+BuildRequires: kf5-extra-cmake-modules >= 1.4.0
+BuildRequires: qt5-linguist >= %{qt_ver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                qt5dir          %{_libdir}/qt5
-
 %description
 KCoreAddons provides classes built on top of QtCore to perform various
 tasks such as manipulating mime types, autosaving files, creating
@@ -55,20 +55,13 @@ Pliki nagłówkowe dla programistów używających %{orgname}.
 install -d build
 cd build
 %cmake \
+       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        -DBIN_INSTALL_DIR=%{_bindir} \
-       -DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \
-       -DPLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-       -DQT_PLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-       -DQML_INSTALL_DIR=%{qt5dir}/qml \
-       -DIMPORTS_INSTALL_DIR=%{qt5dirs}/imports \
-       -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-       -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
-       -DKF5_LIBEXEC_INSTALL_DIR=%{_libexecdir} \
-       -DKF5_INCLUDE_INSTALL_DIR=%{_includedir} \
-       -DECM_MKSPECS_INSTALL_DIR=%{qt5dir}/mkspecs/modules \
        ../
 %{__make}
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,12 +81,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md
 %{_datadir}/mime/packages/kde5.xml
 %attr(755,root,root) %ghost %{_libdir}/libKF5CoreAddons.so.5
-%attr(755,root,root) %{_libdir}/libKF5CoreAddons.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5CoreAddons.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/desktoptojson
 %{_includedir}/KF5/KCoreAddons
 %{_includedir}/KF5/kcoreaddons_version.h
 %{_libdir}/cmake/KF5CoreAddons
 %attr(755,root,root) %{_libdir}/libKF5CoreAddons.so
-%{qt5dir}/mkspecs/modules/qt_KCoreAddons.pri
+%{_libdir}/qt5/mkspecs/modules/qt_KCoreAddons.pri