[kf5] KDE Frameworks 4.99.0
Daniel Vrátil
dvratil at fedoraproject.org
Mon May 5 15:17:28 UTC 2014
commit 81818959c8f2a7a475d1002b87944a328abe8b73
Author: Dan Vrátil <dvratil at redhat.com>
Date: Mon May 5 17:17:23 2014 +0200
KDE Frameworks 4.99.0
kf5.spec | 13 +++++++++++--
macros.kf5 | 10 ++++------
sources | 2 +-
3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/kf5.spec b/kf5.spec
index 20883f6..ffebbfd 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,6 +1,6 @@
Name: kf5
-Version: 4.98.0
-Release: 6
+Version: 4.99.0
+Release: 1
Summary: Filesystem and RPM macros for KDE Frameworks 5
BuildArch: noarch
License: BSD
@@ -43,6 +43,15 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d
%changelog
+* Mon May 05 2014 Daniel Vrátil <dvratil at redhat.com> 4.99.0-1
+- KDE Frameworks 4.99.0
+
+* Mon Apr 28 2014 Daniel Vrátil <dvratil at redhat.com> 4.98.0-8
+- Remove INCLUDE_INSTALL_DIR, since we use the default one
+
+* Tue Apr 22 2014 Daniel Vrátil <dvratil at redhat.com> 4.98.0-7
+- Make DATA_INSTALL_DIR relative, so that CMake config files don't point to /usr/usr/share
+
* Tue Apr 22 2014 Daniel Vrátil <dvratil at redhat.com> 4.98.0-6
- Explicitly set BIN_INSTALL_DIR to be absolute, otherwise CMake complains
diff --git a/macros.kf5 b/macros.kf5
index d6fcf3e..e850513 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -27,8 +27,6 @@
-DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\
- -DDATA_INSTALL_DIR:PATH=%{_kf5_datadir} \\\
- -DINCLUDE_INSTALL_DIR:PATH=%{_kf5_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_kf5_libdir} \\\
%if "%{?_lib}" == "lib64" \
%{?_cmake_lib_suffix64} \\\
@@ -37,7 +35,7 @@
-DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\
-DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\
-DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\
- -DIMPORTS_INSTALL_DIR=%{_qt5_importdir} \\\
- -DECM_MKSPECS_INSTALL_DIR:STRING=%{_kf5_libdir}/qt5/mkspecs/modules \\\
- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} \\\
- -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir}
+ -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}
diff --git a/sources b/sources
index 1226f1f..ee680ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f3822da4b82e0fc0f89be0868638eba macros.kf5
+9687789a251e70efe03b26bc52577a9a macros.kf5
More information about the scm-commits
mailing list