From ef44cf9a1fa29ca0d72c12c145fbfeef429f36c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 4 Jun 2014 10:33:21 +0200 Subject: [PATCH] Point LIBEXEC_INSTALL_DIR to %{_libexecdir} to fix duplicated path --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 2d66b18..e7503e0 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 4 +Release: 5 Summary: Filesystem and RPM macros for KDE Frameworks 5 BuildArch: noarch License: BSD @@ -43,6 +43,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Wed Jun 04 2014 Daniel Vrátil 4.99.0-5 +- Point LIBEXEC_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 e2e6714..dbad461 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -39,6 +39,6 @@ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\ - -DLIBEXEC_INSTALL_DIR:PATH=%{_kf5_libexecdir} \\\ + -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\ -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}