diff --git a/akonadi-16.08.3.tar.xz b/akonadi-16.08.3.tar.xz deleted file mode 100644 index 8ff92d7..0000000 --- a/akonadi-16.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ecb926d6f750ba2903b9ce96819cce758e4e7c9333a0f85fc93e4500a3d26cd -size 1021916 diff --git a/akonadi-16.11.80.tar.xz b/akonadi-16.11.80.tar.xz new file mode 100644 index 0000000..b68e33b --- /dev/null +++ b/akonadi-16.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a49c8320f6e2b75972adbe739572430531373f09cb178b25f127be69ba4252f +size 1036040 diff --git a/akonadi-server.changes b/akonadi-server.changes index cff1013..4e1f8f9 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 29 12:16:29 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.80 + * KDE Applications 16.12.0 Beta + * https://www.kde.org/announcements/announce-applications-16.12-beta.php + + ------------------------------------------------------------------- Sun Nov 20 18:24:27 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/akonadi-server.spec b/akonadi-server.spec index f65f388..ad73997 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -16,10 +16,13 @@ # -Name: akonadi-server -Version: 16.08.3 -Release: 0 %define rname akonadi +Name: akonadi-server +Version: 16.11.80 +Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: PIM Storage Service License: LGPL-2.1+ Group: System/GUI/KDE @@ -28,7 +31,7 @@ Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc BuildRequires: boost-devel BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules +BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libxml2 @@ -36,11 +39,13 @@ BuildRequires: libxslt BuildRequires: libxslt-devel BuildRequires: libxslt-tools BuildRequires: mariadb +BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5DesignerPlugin) BuildRequires: cmake(KF5GuiAddons) @@ -59,19 +64,21 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): shared-mime-info -Requires(postun): shared-mime-info Requires: libqt5-sql-mysql Requires: mysql +Requires(post): shared-mime-info +Requires(postun): shared-mime-info Suggests: mariadb +Obsoletes: akonadi5 < %{version} +Provides: akonadi5 = %{version} +# Needed for users of unstable repositories +Obsoletes: akonadi < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1320 Obsoletes: akonadi-runtime < %{version} %else Conflicts: akonadi-runtime %endif -Obsoletes: akonadi5 < %{version} -Provides: akonadi5 = %{version} %description This package contains the data files of Akonadi, the KDE PIM storage @@ -140,12 +147,13 @@ Requires: kxmlgui-devel Requires: libKF5AkonadiAgentBase5 = %{version} Requires: libKF5AkonadiCore5 = %{version} Requires: libKF5AkonadiWidgets5 = %{version} +Requires: pkgconfig Requires: solid-devel Requires: pkgconfig(Qt5Network) +Conflicts: libakonadiprotocolinternals-devel Obsoletes: akonadi-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} -Conflicts: libakonadiprotocolinternals-devel %description devel This package contains development files of Akonadi, the KDE PIM storage @@ -171,16 +179,12 @@ service. %post -n libKF5AkonadiWidgets5 -p /sbin/ldconfig %postun -n libKF5AkonadiWidgets5 -p /sbin/ldconfig - %post -n libKF5AkonadiCore5 -p /sbin/ldconfig %postun -n libKF5AkonadiCore5 -p /sbin/ldconfig - %post -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig %postun -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig - %post -n libKF5AkonadiPrivate5 -p /sbin/ldconfig %postun -n libKF5AkonadiPrivate5 -p /sbin/ldconfig - %post -n libKF5AkonadiXml5 -p /sbin/ldconfig %postun -n libKF5AkonadiXml5 -p /sbin/ldconfig @@ -193,7 +197,7 @@ service. %{_kf5_bindir}/akonadiserver %{_kf5_bindir}/akonaditest %dir %{_kf5_sysconfdir}/xdg/akonadi -%{_kf5_sysconfdir}/xdg/akonadi.categories +%{_kf5_sysconfdir}/xdg/akonadi.*categories %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service