From c15664513ea9efd95d5711c386ad7210fb99f4b46eb570033261c6d6fb49a143 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:43:51 +0000 Subject: [PATCH 1/4] KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=169 --- akonadi-18.08.3.tar.xz | 3 -- akonadi-18.11.80.tar.xz | 3 ++ akonadi-server.changes | 15 ++++++++ akonadi-server.spec | 79 ++++++++++++++++++----------------------- 4 files changed, 53 insertions(+), 47 deletions(-) delete mode 100644 akonadi-18.08.3.tar.xz create mode 100644 akonadi-18.11.80.tar.xz diff --git a/akonadi-18.08.3.tar.xz b/akonadi-18.08.3.tar.xz deleted file mode 100644 index 8625735..0000000 --- a/akonadi-18.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5761fa496f64658625f4bdbb2e27a160d6d306d5376b077311b5db2f514bc56 -size 1538188 diff --git a/akonadi-18.11.80.tar.xz b/akonadi-18.11.80.tar.xz new file mode 100644 index 0000000..c8552f6 --- /dev/null +++ b/akonadi-18.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fa2d300169c621fede57b21a653949cf211e39322fa5e3f570620ec84a731d0 +size 1552048 diff --git a/akonadi-server.changes b/akonadi-server.changes index 2077995..ce72a35 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 20 06:21:46 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:56:34 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.11.80.php +- Changes since 18.08.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Nov 08 20:43:25 UTC 2018 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 30f63f6..cd8358e 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -16,36 +16,20 @@ # -%bcond_without lang - %define rname akonadi -Name: akonadi-server -Version: 18.08.3 -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: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: akonadi-server +Version: 18.11.80 +Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE -Url: http://akonadi-project.org +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 @@ -55,6 +39,7 @@ BuildRequires: libxslt BuildRequires: libxslt-devel BuildRequires: libxslt-tools BuildRequires: mariadb +BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel @@ -89,10 +74,23 @@ Provides: akonadi5 = %{version} # Needed for users of unstable repositories Obsoletes: akonadi < %{version} Obsoletes: akonadi-runtime < %{version} +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_graph-devel +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif +%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 %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 @@ -151,11 +149,6 @@ Akonadi server's SQlite plugin. Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -%else -Requires: boost-devel -%endif Requires: kcompletion-devel Requires: kdelibs4support-devel Requires: kitemmodels-devel @@ -171,6 +164,11 @@ Conflicts: libakonadiprotocolinternals-devel Obsoletes: akonadi-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} +%if 0%{?suse_version} > 1325 +Requires: libboost_headers-devel +%else +Requires: boost-devel +%endif %description devel This package contains development files of Akonadi, the KDE PIM storage @@ -223,8 +221,8 @@ service. %postun -n libKF5AkonadiXml5 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* AUTHORS +%license COPYING* +%doc AUTHORS %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %dir %{_kf5_configkcfgdir} @@ -249,38 +247,31 @@ service. %{_kf5_sysconfdir}/xdg/akonadi.*categories %files -n libKF5AkonadiAgentBase5 -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libKF5AkonadiAgentBase.so.* %files -n libKF5AkonadiCore5 -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libKF5AkonadiCore.so.* %files -n libKF5AkonadiWidgets5 -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libKF5AkonadiWidgets.so.* %files -n libKF5AkonadiPrivate5 -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libKF5AkonadiPrivate.so.* %files -n libKF5AkonadiXml5 -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libKF5AkonadiXml.so.* %files sqlite -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_plugindir}/sqldrivers/ %files devel -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %dir %{_kf5_cmakedir} %{_kf5_bindir}/akonadi2xml %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml @@ -306,7 +297,7 @@ service. %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog From a09751025b52ac43df9445e6bb72599267520fc9c3a68c64d84041429af57768 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:21:42 +0000 Subject: [PATCH 2/4] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=170 --- akonadi-18.11.80.tar.xz | 3 --- akonadi-18.11.90.tar.xz | 3 +++ akonadi-server.changes | 10 ++++++++++ akonadi-server.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 akonadi-18.11.80.tar.xz create mode 100644 akonadi-18.11.90.tar.xz diff --git a/akonadi-18.11.80.tar.xz b/akonadi-18.11.80.tar.xz deleted file mode 100644 index c8552f6..0000000 --- a/akonadi-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fa2d300169c621fede57b21a653949cf211e39322fa5e3f570620ec84a731d0 -size 1552048 diff --git a/akonadi-18.11.90.tar.xz b/akonadi-18.11.90.tar.xz new file mode 100644 index 0000000..dc3b76f --- /dev/null +++ b/akonadi-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d2de6d6904bcd2d894a808837e3dad25009d619206f84a0894fab239e1bc152 +size 1552044 diff --git a/akonadi-server.changes b/akonadi-server.changes index ce72a35..03d73f5 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 03 20:55:44 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * Akonadi: ignore remote ID if it's empty + ------------------------------------------------------------------- Tue Nov 20 06:21:46 UTC 2018 - Luca Beltrame diff --git a/akonadi-server.spec b/akonadi-server.spec index cd8358e..bdf2867 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 18.11.80 +Version: 18.11.90 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later From 32d722674455a4c16b49dc98a80c06596ba4c69eb80b60fa39b1fbc49c2c767b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:49:58 +0000 Subject: [PATCH 3/4] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=171 --- akonadi-18.11.90.tar.xz | 3 --- akonadi-18.12.0.tar.xz | 3 +++ akonadi-server.changes | 12 ++++++++++++ akonadi-server.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 akonadi-18.11.90.tar.xz create mode 100644 akonadi-18.12.0.tar.xz diff --git a/akonadi-18.11.90.tar.xz b/akonadi-18.11.90.tar.xz deleted file mode 100644 index dc3b76f..0000000 --- a/akonadi-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d2de6d6904bcd2d894a808837e3dad25009d619206f84a0894fab239e1bc152 -size 1552044 diff --git a/akonadi-18.12.0.tar.xz b/akonadi-18.12.0.tar.xz new file mode 100644 index 0000000..7eac4f8 --- /dev/null +++ b/akonadi-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0860b4a3e2a091658b93a032cbf78d677dbb3acfd305469009205f365dce6eb0 +size 1552448 diff --git a/akonadi-server.changes b/akonadi-server.changes index 03d73f5..127af8a 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 14 06:08:43 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * Fix ModelSpy (and thus some model tests) + * Fix ItemStoreTest + * Fix creating new tags with null parent + ------------------------------------------------------------------- Mon Dec 03 20:55:44 UTC 2018 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index bdf2867..4851122 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 18.11.90 +Version: 18.12.0 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later From 930e37bc7acb333bad46ed8280064807665d67ccb0490c972e5ba7b2a9d7c57a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 21:24:16 +0000 Subject: [PATCH 4/4] Fix beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=172 --- akonadi-server.changes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 127af8a..28f9d13 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -31,7 +31,7 @@ Tue Nov 20 05:56:34 UTC 2018 - lbeltrame@kde.org - Update to 18.11.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.11.80.php + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Too many changes to list here @@ -112,7 +112,7 @@ 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 + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * Too many changes to list here - Build with gcc7 on Leap 42.3 @@ -175,7 +175,7 @@ Fri Apr 06 07:08:39 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * Too many changes to list here @@ -337,7 +337,7 @@ 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 + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -441,7 +441,7 @@ Sat Mar 25 23:10:05 CET 2017 - lbeltrame@kde.org - Update to 17.03.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * Too many changes to list here @@ -588,7 +588,7 @@ Mon Aug 8 14:22:41 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.07.90 * KDE Applications 16.07.90 (16.08-RC) - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php ------------------------------------------------------------------- @@ -765,7 +765,7 @@ Fri Aug 7 07:33:31 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php - Drop patch do-not-leak-old-external-payload-files.diff due to upstream inclusion