From c6c0f17fff6941fe8f45662cfbc35b2017fa51039d3a1f254bebddf50536d82a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 11 Aug 2016 12:18:21 +0000 Subject: [PATCH] Accepting request 418271 from home:wolfi323:branches:KDE:Applications - Cleanup build requirements - Drop no longer respected QTWEBENGINE_SUPPORT_OPTION from cmake (QtWebEngine is mandatory now) OBS-URL: https://build.opensuse.org/request/show/418271 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-contact?expand=0&rev=4 --- akonadi-contact.changes | 7 +++++++ akonadi-contact.spec | 45 +++++++---------------------------------- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/akonadi-contact.changes b/akonadi-contact.changes index df3541e..f8975af 100644 --- a/akonadi-contact.changes +++ b/akonadi-contact.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 9 19:18:15 UTC 2016 - wbauer@tmo.at + +- Cleanup build requirements +- Drop no longer respected QTWEBENGINE_SUPPORT_OPTION from cmake + (QtWebEngine is mandatory now) + ------------------------------------------------------------------- Mon Aug 8 14:26:12 UTC 2016 - tittiatcoke@gmail.com diff --git a/akonadi-contact.spec b/akonadi-contact.spec index d58a41c..f483a78 100644 --- a/akonadi-contact.spec +++ b/akonadi-contact.spec @@ -19,59 +19,28 @@ Name: akonadi-contact Version: 16.07.90 Release: 0 -%define kf5_version 5.1.0 +%define kf5_version 5.23.0 Summary: KDE PIM Libraries for Akonadi Contacts License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: akonadi-contacts-%{version}.tar.xz -BuildRequires: boost-devel >= 1.34.0 -BuildRequires: cyrus-sasl-devel -BuildRequires: extra-cmake-modules >= 1.0.0 -BuildRequires: gpgme-devel +BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kmime-devel BuildRequires: kcontacts-devel BuildRequires: kcalcore-devel -BuildRequires: kcalutils-devel -BuildRequires: kldap-devel -BuildRequires: kmbox-devel BuildRequires: grantlee5-devel -BuildRequires: kidentitymanagement-devel BuildRequires: akonadi-mime-devel -BuildRequires: kcmutils-devel >= %{kf5_version} BuildRequires: kcodecs-devel >= %{kf5_version} BuildRequires: kcompletion-devel >= %{kf5_version} -BuildRequires: kconfig-devel >= %{kf5_version} -BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kdelibs4support-devel >= %{kf5_version} -BuildRequires: kdoctools-devel >= %{kf5_version} -BuildRequires: kemoticons-devel >= %{kf5_version} -BuildRequires: kcodecs-devel >= %{kf5_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{kf5_version} BuildRequires: kio-devel >= %{kf5_version} -BuildRequires: kitemviews-devel >= %{kf5_version} -BuildRequires: kparts-devel >= %{kf5_version} -BuildRequires: ktextwidgets-devel >= %{kf5_version} -BuildRequires: kwallet-devel >= %{kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} -BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: akonadi-server-devel >= 16.04 -BuildRequires: libassuan-devel -BuildRequires: libical-devel >= 0.42 -BuildRequires: libpth-devel -BuildRequires: libxslt-devel -BuildRequires: openldap2-devel +BuildRequires: akonadi-server-devel >= 16.07.90 BuildRequires: libprison-devel -BuildRequires: solid-devel >= %{kf5_version} -BuildRequires: sonnet-devel >= %{kf5_version} -BuildRequires: pkgconfig(Qt5Designer) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 +BuildRequires: pkgconfig(Qt5WebEngineWidgets) >= 5.6.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libKF5AkonadiContact5 = %{version} @@ -107,7 +76,7 @@ to develop KDE PIM applications. %setup -q -n akonadi-contacts-%{version} %build -%cmake_kf5 -d build -- -DQTWEBENGINE_SUPPORT_OPTION=TRUE -DKF5_INCLUDE_INSTALL_DIR=%_kf5_includedir +%cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%_kf5_includedir %make_jobs %install