From ce2b66e0cfd1cf547ba27da032525104289316f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 27 May 2014 17:41:53 +0200 Subject: [PATCH] Make LIB_INSTALL_DIR relative so that CMake does not generate /usr/usr/lib/... --- kf5.spec | 5 ++++- macros.kf5 | 2 +- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 6e5cd86..2d66b18 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 4.99.0 -Release: 3 +Release: 4 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 May 14 2014 Daniel Vrátil 4.99.0-4 +- Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake + * Tue May 06 2014 Daniel Vrátil 4.99.0-3 - Define KF5_INCLUDE_INSTALL_DIR diff --git a/macros.kf5 b/macros.kf5 index 2ce4367..e2e6714 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -28,7 +28,7 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_lib} \\\ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ %endif \ diff --git a/sources b/sources index 6d3eb34..ab62369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebe50627bd3a4a03037ae311b19a9c23 macros.kf5 +e6b17285db08eb7baafd6405e8b500e8 macros.kf5