From 3bdc937e4f070b397aeb0a9934adc52f5f7c7609 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 May 2016 09:01:10 -0500 Subject: [PATCH] rpm-macros: fix KDE_INSTALL_INCLUDEDIR --- kf5.spec | 5 ++++- macros.kf5 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index b3ac5d8..d66f888 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.22.0 -Release: 1%{?dist} +Release: 2%{?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-2 +- rpm-macros: fix KDE_INSTALL_INCLUDEDIR + * Mon May 09 2016 Rex Dieter - 5.22.0-1 - KDE Frameworks 5.22.0 - rpm-macros: update to use -DKDE_INSTALL_... style definitions diff --git a/macros.kf5 b/macros.kf5 index 7241d3b..57d6555 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -31,7 +31,7 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\ -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\ - -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\ + -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\ -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\ -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\ -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\