[kf5] Define KF5_INCLUDE_INSTALL_DIR and KF5_LIBEXEC_INSTALL_DIR

Daniel Vrátil dvratil at fedoraproject.org
Tue May 13 08:15:55 UTC 2014


commit 0ba3d064aaf1f93335a6e513e35a5873aa849bde
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue May 13 10:15:41 2014 +0200

    Define KF5_INCLUDE_INSTALL_DIR and KF5_LIBEXEC_INSTALL_DIR

 kf5.spec   |    8 +++++++-
 macros.kf5 |    5 ++++-
 sources    |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/kf5.spec b/kf5.spec
index ffebbfd..6e5cd86 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,6 +1,6 @@
 Name:           kf5
 Version:        4.99.0
-Release:        1
+Release:        3
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
 BuildArch:      noarch
 License:        BSD
@@ -43,6 +43,12 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d
 
 
 %changelog
+* Tue May 06 2014 Daniel Vrátil <dvratil at redhat.com> 4.99.0-3
+- Define KF5_INCLUDE_INSTALL_DIR
+
+* Mon May 05 2014 Daniel Vrátil <dvratil at redhat.com> 4.99.0-2
+- Define KF5_LIBEXEC_INSTALL_DIR
+
 * Mon May 05 2014 Daniel Vrátil <dvratil at redhat.com> 4.99.0-1
 - KDE Frameworks 4.99.0
 
diff --git a/macros.kf5 b/macros.kf5
index e850513..2ce4367 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -27,6 +27,7 @@
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
     -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\
+    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
     -DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\
 %if "%{?_lib}" == "lib64" \
      %{?_cmake_lib_suffix64} \\\
@@ -38,4 +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=%{_kf5_libexecdir} \\\
+    -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\
+    -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
diff --git a/sources b/sources
index ee680ea..6d3eb34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9687789a251e70efe03b26bc52577a9a  macros.kf5
+ebe50627bd3a4a03037ae311b19a9c23  macros.kf5


More information about the scm-commits mailing list