diff --git a/akonadi-18.04.3.tar.xz b/akonadi-18.04.3.tar.xz deleted file mode 100644 index 9c9e08c..0000000 --- a/akonadi-18.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5232cfe7f145762f71d8b4595ac84b2b1facfb908eca0f1067fa39a89124374 -size 1526416 diff --git a/akonadi-18.07.80.tar.xz b/akonadi-18.07.80.tar.xz new file mode 100644 index 0000000..5378728 --- /dev/null +++ b/akonadi-18.07.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325075cac616f25a9773be54b1a29f3dcd0bbfba2509536a0f91fa952a1b66e7 +size 1537524 diff --git a/akonadi-server.changes b/akonadi-server.changes index 3a1559c..9fc7c9d 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 26 13:00:24 UTC 2018 - lbeltrame@kde.org + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Too many changes to list here +- Build with gcc7 on Leap 42.3 + ------------------------------------------------------------------- Fri Jul 13 04:49:44 UTC 2018 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index f74c6a6..546a09b 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,11 +20,11 @@ %define rname akonadi Name: akonadi-server -Version: 18.04.3 +Version: 18.07.80 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE @@ -32,10 +32,20 @@ Url: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc %if 0%{?suse_version} > 1325 +BuildRequires: libboost_graph-devel BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif +# Needed for 42.3 +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +%if 0%{?sle_version} < 120300 +BuildRequires: gcc6-c++ +%else +BuildRequires: gcc7-c++ +%endif +%endif BuildRequires: cmake >= 3.0.0 BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem