From 1aeb559ce5ab3e8f836c99b5acaef18010b32889 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 May 2016 09:12:21 -0500 Subject: [PATCH] rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR --- kf5.spec | 5 ++++- macros.kf5 | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index d66f888..82c7cc1 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -69,6 +69,9 @@ sed -i \ %changelog +* Sat May 14 2016 Rex Dieter - 5.22.0-3 +- rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR + * Sat May 14 2016 Rex Dieter - 5.22.0-2 - rpm-macros: fix KDE_INSTALL_INCLUDEDIR diff --git a/macros.kf5 b/macros.kf5 index 57d6555..86a4a8b 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -1,5 +1,5 @@ %_kf5_prefix %_prefix -%_kf5_archdatadir %_libdir/qt5 +%_kf5_archdatadir %_qt5_archdatadir %_kf5_bindir %_kf5_prefix/bin %_kf5_datadir %_datadir %_kf5_docdir /usr/share/doc @@ -29,7 +29,7 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\ -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ - -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\ + -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_archdatadir}/mkspecs/modules \\\ -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\