From d2e6ba46e60e53f69c524811693ba56d528529babf5dd680320527920faabbba Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:22:25 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=115 --- akonadi-17.04.3.tar.xz | 3 --- akonadi-17.07.90.tar.xz | 3 +++ akonadi-server.changes | 8 ++++++++ akonadi-server.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 akonadi-17.04.3.tar.xz create mode 100644 akonadi-17.07.90.tar.xz diff --git a/akonadi-17.04.3.tar.xz b/akonadi-17.04.3.tar.xz deleted file mode 100644 index 03bcafd..0000000 --- a/akonadi-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89e0476892a9b43ae0686e059f6caa0e2bba47955920e3424f5315b1cba7ad31 -size 1302964 diff --git a/akonadi-17.07.90.tar.xz b/akonadi-17.07.90.tar.xz new file mode 100644 index 0000000..dbcc940 --- /dev/null +++ b/akonadi-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32929d6433a96f244f32b24d4e6601482c8e62bdca5664091df2a1a7823862ea +size 1426772 diff --git a/akonadi-server.changes b/akonadi-server.changes index 27f8552..8570c85 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:16:19 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + ------------------------------------------------------------------- Sat Jul 15 22:58:50 CEST 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 64fd74a..0bbca7d 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.04.3 +Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 5357a77dd201dcd43882ca5b24c3fb0727d94411a56a5ac430677c0bbe55602c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:35:16 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=116 --- akonadi-server.spec | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index 0bbca7d..a508a6a 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -202,27 +202,29 @@ service. %files %defattr(-,root,root) -%{_kf5_bindir}/asapcat +%doc COPYING* AUTHORS README* +%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf +%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf +%dir %{_kf5_configkcfgdir} +%dir %{_kf5_sysconfdir}/xdg/akonadi +%exclude %{_kf5_plugindir}/sqldrivers/ +%{_datadir}/akonadi/ +%{_datadir}/kf5/akonadi/ +%{_datadir}/kf5/akonadi_knut_resource/ %{_kf5_bindir}/akonadi_* %{_kf5_bindir}/akonadictl %{_kf5_bindir}/akonadiselftest %{_kf5_bindir}/akonadiserver %{_kf5_bindir}/akonaditest -%dir %{_kf5_sysconfdir}/xdg/akonadi -%{_kf5_sysconfdir}/xdg/akonadi.*categories -%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf -%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf +%{_kf5_bindir}/asapcat +%{_kf5_configkcfgdir}/resourcebase.kcfg +%{_kf5_iconsdir}/hicolor/*/apps/akonadi* +%{_kf5_plugindir}/akonadi/ +%{_kf5_plugindir}/designer/ +%{_kf5_plugindir}/sqldrivers/libqsqlite3.so %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_kf5_sharedir}/mime/packages/akonadi-mime.xml -%{_kf5_plugindir}/sqldrivers/libqsqlite3.so -%{_datadir}/kf5/akonadi/ -%dir %{_kf5_configkcfgdir} -%{_kf5_configkcfgdir}/resourcebase.kcfg -%{_kf5_plugindir}/designer/ -%{_kf5_plugindir}/akonadi/ -%{_datadir}/akonadi/ -%{_datadir}/kf5/akonadi_knut_resource/ -%exclude %{_kf5_plugindir}/sqldrivers/ +%{_kf5_sysconfdir}/xdg/akonadi.*categories %files -n libKF5AkonadiAgentBase5 %defattr(-,root,root) @@ -250,24 +252,24 @@ service. %files devel %defattr(-,root,root) +%dir %{_kf5_libdir}/cmake %{_kf5_bindir}/akonadi2xml -%{_kf5_includedir}/akonadi/ -%{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiAgentBase/ +%{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiWidgets/ %{_kf5_includedir}/AkonadiXml/ -%dir %{_kf5_libdir}/cmake -%{_kf5_libdir}/cmake/KF5Akonadi +%{_kf5_includedir}/akonadi/ %{_kf5_includedir}/akonadi_version.h +%{_kf5_libdir}/cmake/KF5Akonadi %{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml -%{_libdir}/libKF5AkonadiPrivate.so -%{_libdir}/libKF5AkonadiCore.so -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri %{_libdir}/libKF5AkonadiAgentBase.so -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri +%{_libdir}/libKF5AkonadiCore.so +%{_libdir}/libKF5AkonadiPrivate.so %{_libdir}/libKF5AkonadiWidgets.so -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri %{_libdir}/libKF5AkonadiXml.so +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri %{_libdir}/qt5/mkspecs/modules/qt_AkonadiXml.pri %if %{with lang} From 1fd264a852dfe4df652ce2f148242f3b8bbd422e098bddb5a171e9cb352035d3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:58:05 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=117 --- akonadi-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/akonadi-server.spec b/akonadi-server.spec index a508a6a..a055b75 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -206,6 +206,7 @@ service. %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %dir %{_kf5_configkcfgdir} +%dir %{_kf5_iconsdir}/hicolor/256x256 %dir %{_kf5_sysconfdir}/xdg/akonadi %exclude %{_kf5_plugindir}/sqldrivers/ %{_datadir}/akonadi/ From 02686a2d3a486482a10c77a468f4aa800202485b79aff3392fc342571515b447 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 19:40:17 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=118 --- akonadi-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/akonadi-server.spec b/akonadi-server.spec index a055b75..548af63 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -207,6 +207,7 @@ service. %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %dir %{_kf5_configkcfgdir} %dir %{_kf5_iconsdir}/hicolor/256x256 +%dir %{_kf5_iconsdir}/hicolor/256x256/apps %dir %{_kf5_sysconfdir}/xdg/akonadi %exclude %{_kf5_plugindir}/sqldrivers/ %{_datadir}/akonadi/ From 89e37ed82ad6436688e27962ace56726264e42a43fe5a2d8045c3481dd4b31a2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 22:52:12 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=119 --- akonadi-server.changes | 9 +++++++ akonadi-server.spec | 56 +++++++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 8570c85..be4bd3b 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:44:47 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : +- Too many changes to list here + ------------------------------------------------------------------- Sat Aug 5 18:16:19 UTC 2017 - christophe@krop.fr diff --git a/akonadi-server.spec b/akonadi-server.spec index 548af63..97854a5 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -23,7 +23,7 @@ Name: akonadi-server Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# 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}')} Summary: PIM Storage Service License: LGPL-2.1+ @@ -36,7 +36,7 @@ BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.0.0 BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel @@ -78,9 +78,11 @@ Obsoletes: akonadi5 < %{version} Provides: akonadi5 = %{version} # Needed for users of unstable repositories Obsoletes: akonadi < %{version} -Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: akonadi-runtime < %{version} +%if %{with lang} +Recommends: %{name}-lang +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the data files of Akonadi, the KDE PIM storage @@ -202,7 +204,7 @@ service. %files %defattr(-,root,root) -%doc COPYING* AUTHORS README* +%doc COPYING* AUTHORS %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %dir %{_kf5_configkcfgdir} @@ -220,7 +222,8 @@ service. %{_kf5_bindir}/akonaditest %{_kf5_bindir}/asapcat %{_kf5_configkcfgdir}/resourcebase.kcfg -%{_kf5_iconsdir}/hicolor/*/apps/akonadi* +%{_kf5_iconsdir}/hicolor/*/apps/akonadi.png +%{_kf5_iconsdir}/hicolor/scalable/apps/akonadi.svgz %{_kf5_plugindir}/akonadi/ %{_kf5_plugindir}/designer/ %{_kf5_plugindir}/sqldrivers/libqsqlite3.so @@ -230,49 +233,56 @@ service. %files -n libKF5AkonadiAgentBase5 %defattr(-,root,root) -%{_libdir}/libKF5AkonadiAgentBase.so.* +%doc COPYING* +%{_kf5_libdir}/libKF5AkonadiAgentBase.so.* %files -n libKF5AkonadiCore5 %defattr(-,root,root) -%{_libdir}/libKF5AkonadiCore.so.* +%doc COPYING* +%{_kf5_libdir}/libKF5AkonadiCore.so.* %files -n libKF5AkonadiWidgets5 %defattr(-,root,root) -%{_libdir}/libKF5AkonadiWidgets.so.* +%doc COPYING* +%{_kf5_libdir}/libKF5AkonadiWidgets.so.* %files -n libKF5AkonadiPrivate5 %defattr(-,root,root) -%{_libdir}/libKF5AkonadiPrivate.so.* +%doc COPYING* +%{_kf5_libdir}/libKF5AkonadiPrivate.so.* %files -n libKF5AkonadiXml5 %defattr(-,root,root) -%{_libdir}/libKF5AkonadiXml.so.* +%doc COPYING* +%{_kf5_libdir}/libKF5AkonadiXml.so.* %files sqlite %defattr(-,root,root) +%doc COPYING* %{_kf5_plugindir}/sqldrivers/ %files devel %defattr(-,root,root) -%dir %{_kf5_libdir}/cmake +%doc COPYING* +%dir %{_kf5_cmakedir} %{_kf5_bindir}/akonadi2xml +%{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml %{_kf5_includedir}/AkonadiAgentBase/ %{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiWidgets/ %{_kf5_includedir}/AkonadiXml/ %{_kf5_includedir}/akonadi/ %{_kf5_includedir}/akonadi_version.h -%{_kf5_libdir}/cmake/KF5Akonadi -%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml -%{_libdir}/libKF5AkonadiAgentBase.so -%{_libdir}/libKF5AkonadiCore.so -%{_libdir}/libKF5AkonadiPrivate.so -%{_libdir}/libKF5AkonadiWidgets.so -%{_libdir}/libKF5AkonadiXml.so -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri -%{_libdir}/qt5/mkspecs/modules/qt_AkonadiXml.pri +%{_kf5_cmakedir}/KF5Akonadi +%{_kf5_libdir}/libKF5AkonadiAgentBase.so +%{_kf5_libdir}/libKF5AkonadiCore.so +%{_kf5_libdir}/libKF5AkonadiPrivate.so +%{_kf5_libdir}/libKF5AkonadiWidgets.so +%{_kf5_libdir}/libKF5AkonadiXml.so +%{_kf5_mkspecsdir}/qt_AkonadiAgentBase.pri +%{_kf5_mkspecsdir}/qt_AkonadiCore.pri +%{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri +%{_kf5_mkspecsdir}/qt_AkonadiXml.pri %if %{with lang} %files lang -f %{name}.lang From 7648c9c638456027dcfb1a2e6877d80588e312f116b924364ce9b96801167ee4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:07:33 +0000 Subject: [PATCH 6/6] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=120 --- akonadi-17.07.90.tar.xz | 3 --- akonadi-17.08.0.tar.xz | 3 +++ akonadi-server.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 akonadi-17.07.90.tar.xz create mode 100644 akonadi-17.08.0.tar.xz diff --git a/akonadi-17.07.90.tar.xz b/akonadi-17.07.90.tar.xz deleted file mode 100644 index dbcc940..0000000 --- a/akonadi-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32929d6433a96f244f32b24d4e6601482c8e62bdca5664091df2a1a7823862ea -size 1426772 diff --git a/akonadi-17.08.0.tar.xz b/akonadi-17.08.0.tar.xz new file mode 100644 index 0000000..210bd96 --- /dev/null +++ b/akonadi-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7fea93ea49cc82fc25ad36b1bcfd45d5102c841d5cbdfdb598f854df71bb202 +size 1426892 diff --git a/akonadi-server.spec b/akonadi-server.spec index 97854a5..f57278b 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.07.90 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)