summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Dieter <rdieter@math.unl.edu>2015-01-08 14:58:11 (GMT)
committerRex Dieter <rdieter@math.unl.edu>2015-01-08 14:58:11 (GMT)
commitf8437d9b98ad772125d5b13d5e64ec1a2afcfdf3 (patch)
tree7b1cfb4b7949f4bc74f7c7670fab907ea2cae81d
parent8acc3d6ce7909eb1ed0cfb575bc59cef48703340 (diff)
downloadakonadi-master.zip
akonadi-master.tar.gz
akonadi-master.tar.xz
drop el6/cmake hacksHEADmaster
-rw-r--r--akonadi.spec15
1 files changed, 6 insertions, 9 deletions
diff --git a/akonadi.spec b/akonadi.spec
index b0e4f12..2a03b15 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -5,12 +5,6 @@
# 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
-
# legacy nepomuk/soprano support (ie, kde < 4.13)
%if 0%{?fedora} < 20
%define soprano 1
@@ -24,7 +18,7 @@
Summary: PIM Storage Service
Name: akonadi
Version: 1.13.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: LGPLv2+
URL: http://community.kde.org/KDE_PIM/Akonadi
@@ -58,7 +52,7 @@ Patch9: 0009-Test-whether-compiler-supports-all-required-C-11-fea.patch
BuildRequires: automoc4
BuildRequires: boost-devel
-BuildRequires: %{cmake_pkg} >= 2.8.8
+BuildRequires: cmake >= 2.8.8
# for xsltproc
BuildRequires: libxslt
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml)
@@ -113,7 +107,7 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{?cmake28}%{!?cmake28:%{?cmake}} \
+%{cmake} \
-DCONFIG_INSTALL_DIR=%{_sysconfdir} \
%{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \
@@ -216,6 +210,9 @@ fi
%changelog
+* Thu Jan 08 2015 Rex Dieter <rdieter@fedoraproject.org> 1.13.0-6
+- drop el6/cmake hacks
+
* Fri Oct 31 2014 Rex Dieter <rdieter@fedoraproject.org> 1.13.0-5
- latest 1.13 branch fixes