- more cmake variables

diff --git a/kf5-kcoreaddons.spec b/kf5-kcoreaddons.spec
index b03e81a20df8e78d2107c42660a88f2d05189286..9bbde458401cd1345a3592a4a36ca49565ef01ed 100644 (file)
--- a/kf5-kcoreaddons.spec
+++ b/kf5-kcoreaddons.spec
@@ -7,7 +7,7 @@
 %define                orgname         kcoreaddons
 
 Summary:       Utilities for core application functionality and accessing the OS
-Name:          kde5-%{orgname}
+Name:          kf5-%{orgname}
 Version:       5.0.0
 Release:       0.1
 License:       GPL v2+/LGPL v2.1+
@@ -19,12 +19,14 @@ BuildRequires:      Qt5Core-devel >= 5.2.0
 BuildRequires: Qt5Test-devel
 BuildRequires: cmake >= 2.8.12
 BuildRequires: fam-devel
-BuildRequires: kde5-extra-cmake-modules >= 1.0.0
+BuildRequires: kf5-extra-cmake-modules >= 1.0.0
 BuildRequires: qt5-linguist
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
 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
@@ -51,7 +53,17 @@ Pliki nagłówkowe dla programistów używających %{orgname}.
 install -d build
 cd build
 %cmake \
-       -DECM_MKSPECS_INSTALL_DIR=%{_libdir}/qt5/mkspecs/modules \
+       -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}
 
@@ -82,4 +94,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/KF5/kcoreaddons_version.h
 %{_libdir}/cmake/KF5CoreAddons
 %attr(755,root,root) %{_libdir}/libKF5CoreAddons.so
-%{_libdir}/qt5/mkspecs/modules/qt_KCoreAddons.pri
+%{qt5dir}/mkspecs/modules/qt_KCoreAddons.pri