From fdc262e626173bca787f2298c95dacd25fe1e74c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 16 2014 11:55:05 +0000 Subject: WITH_SOPRANO=OFF (kde-4.13,fc21+) --- diff --git a/akonadi.spec b/akonadi.spec index 95bcf26..3f2aa3f 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -11,10 +11,15 @@ %define cmake_pkg cmake %endif +# legacy nepomuk/soprano support (ie, kde < 4.13) +%if 0%{?fedora} < 21 +%define soprano 1 +%endif + Summary: PIM Storage Service Name: akonadi Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -43,7 +48,9 @@ BuildRequires: %{cmake_pkg} >= 2.8.8 BuildRequires: libxslt BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml) BuildRequires: pkgconfig(shared-mime-info) +%if 0%{?soprano} BuildRequires: pkgconfig(soprano) +%endif BuildRequires: pkgconfig(sqlite3) >= 3.6.23 # %%check BuildRequires: dbus-x11 xorg-x11-server-Xvfb @@ -95,6 +102,7 @@ pushd %{_target_platform} -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \ -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ + -DWITH_SOPRANO:BOOL=%{?soprano:ON}%{!?soprano:OFF} \ .. popd @@ -190,6 +198,9 @@ fi %changelog +* Wed Apr 16 2014 Rex Dieter 1.12.1-3 +- WITH_SOPRANO=OFF (kde-4.13,fc21+) + * Tue Apr 15 2014 Rex Dieter 1.12.1-2 - drop mysql-global-mobile.conf, it's too minimalistic - drop Requires: qt4 >= 4.8.5-10 (workaround for psql driver bug had only a small window a long time ago)