[akonadi] make el6-friendly wrt cmake
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 19 16:45:47 UTC 2013
commit 144b6c01e9303be5bb936c182a597510d3770c74
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Jul 19 11:44:20 2013 -0500
make el6-friendly wrt cmake
Will think about better solutions for %%build ...
possibly adding a %%cmake28 macro to fedora's 'cmake' pkg too
akonadi.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/akonadi.spec b/akonadi.spec
index 9065fb6..9ddbcc5 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -5,6 +5,12 @@
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
+%if 0%{?rhel} == 6
+%define cmake_pkg cmake28
+%else
+%define cmake_pkg cmake
+%endif
+
Summary: PIM Storage Service
Name: akonadi
Version: 1.10.0
@@ -32,7 +38,7 @@ Source10: akonadiserverrc.mysql
BuildRequires: automoc4
BuildRequires: boost-devel
-BuildRequires: cmake >= 2.8.8
+BuildRequires: %{cmake_pkg} >= 2.8.8
# for xsltproc
BuildRequires: libxslt
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml)
@@ -85,7 +91,7 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake} \
+%{?cmake28}%{!?cmake28:%{?cmake}} \
-DCONFIG_INSTALL_DIR=%{_sysconfdir} \
%{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \
More information about the scm-commits
mailing list