[kf5/f20] Add new KF5-specific variables to our CMake command

Daniel Vrátil dvratil at fedoraproject.org
Thu Aug 21 16:36:00 UTC 2014


commit f1336bd96a29e6b90121f7f2fdd2494379584212
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Aug 21 18:35:17 2014 +0200

    Add new KF5-specific variables to our CMake command

 kf5.spec   |    5 ++++-
 macros.kf5 |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/kf5.spec b/kf5.spec
index cd73514..3dc6ba5 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,6 +1,6 @@
 Name:           kf5
 Version:        5.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 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
+* Thu Aug 21 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.0-2
+- Add new KF5-specific variables to our CMake command
+
 * Wed Aug 06 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.0-1
 - KDE Frameworks 5.1.0
 
diff --git a/macros.kf5 b/macros.kf5
index 501bc51..817a972 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -25,6 +25,9 @@
     -DBUILD_TESTING:BOOL=FALSE \\\
     -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
+    -DCMAKE_INSTALL_FULL_BINDIR=%{_kf5_bindir} \\\
+    -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \\\
+    -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
     -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\


More information about the scm-commits mailing list