From 9c34be0e424fa2c5284141c112eb14499baaf4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 4 Jun 2014 10:54:14 +0200 Subject: [PATCH] Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own --- kf5.spec | 7 +++++-- macros.kf5 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index e7503e0..972d48c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 5 +Release: 6 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,8 +43,11 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Jun 04 2014 Daniel Vrátil 4.99.0-6 +- Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own + * Wed Jun 04 2014 Daniel Vrátil 4.99.0-5 -- Point LIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path +- Point -DLIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path * Wed May 14 2014 Daniel Vrátil 4.99.0-4 - Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake diff --git a/macros.kf5 b/macros.kf5 index dbad461..501bc51 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -33,7 +33,7 @@ %{?_cmake_lib_suffix64} \\\ %endif \ -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\ - -DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\ + -DPLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\