From d182da31ee44962e7946c21f49b9aaea8286dd83d57138fe422e5c6b00769f9f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 7 Feb 2020 08:19:30 +0000 Subject: [PATCH 1/2] Applications 19.12.2 (take 2) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-contact?expand=0&rev=137 --- akonadi-contact.changes | 12 +++++++++++- akonadi-contact.spec | 15 ++++++++++----- akonadi-contacts-19.12.1.tar.xz | 3 --- akonadi-contacts-19.12.1.tar.xz.sig | 11 ----------- akonadi-contacts-19.12.2.tar.xz | 3 +++ akonadi-contacts-19.12.2.tar.xz.sig | 11 +++++++++++ 6 files changed, 35 insertions(+), 20 deletions(-) delete mode 100644 akonadi-contacts-19.12.1.tar.xz delete mode 100644 akonadi-contacts-19.12.1.tar.xz.sig create mode 100644 akonadi-contacts-19.12.2.tar.xz create mode 100644 akonadi-contacts-19.12.2.tar.xz.sig diff --git a/akonadi-contact.changes b/akonadi-contact.changes index 9fb8dc9..6c8711d 100644 --- a/akonadi-contact.changes +++ b/akonadi-contact.changes @@ -1,8 +1,18 @@ +------------------------------------------------------------------- +Wed Feb 5 06:28:38 UTC 2020 - Luca Beltrame + +- Update to 19.12.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.2 +- No code change since 19.12.1 +- Update build requirements + ------------------------------------------------------------------- Tue Jan 28 18:54:35 UTC 2020 - Stefan Brüns - Remove no longer needed BuildRequires: KF5AkonadiMime (18.04), - Qt5WebEngineWidgets/Qt5WebEngine (17.12) and Grantlee (17.12). + Qt5WebEngineWidgets/Qt5WebEngine (17.12) and Grantlee (17.12). Add some previously implicit KF5 dependencies. ------------------------------------------------------------------- diff --git a/akonadi-contact.spec b/akonadi-contact.spec index 88a86a4..2976035 100644 --- a/akonadi-contact.spec +++ b/akonadi-contact.spec @@ -23,7 +23,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-contact -Version: 19.12.1 +Version: 19.12.2 Release: 0 Summary: KDE PIM Libraries for Akonadi Contacts License: LGPL-2.1-or-later @@ -43,13 +43,17 @@ BuildRequires: cmake(KF5Completion) >= %{kf5_version} BuildRequires: cmake(KF5Config) >= %{kf5_version} BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version} -BuildRequires: cmake(KF5KIO) >= %{kf5_version} BuildRequires: cmake(KF5I18n) >= %{kf5_version} BuildRequires: cmake(KF5IconThemes) >= %{kf5_version} +BuildRequires: cmake(KF5KIO) >= %{kf5_version} BuildRequires: cmake(KF5Mime) -BuildRequires: cmake(KF5Prison) -BuildRequires: cmake(Qt5Test) >= 5.11.0 -BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: cmake(KF5Prison) >= %{kf5_version} +BuildRequires: cmake(KF5Service) >= %{kf5_version} +BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version} +BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version} +BuildRequires: cmake(KF5XmlGui) >= %{kf5_version} +BuildRequires: cmake(Qt5Test) >= 5.12.0 +BuildRequires: cmake(Qt5Widgets) >= 5.12.0 Requires: libKF5AkonadiContact5 = %{version} Requires: libKF5ContactEditor5 = %{version} Recommends: %{name}-lang @@ -96,6 +100,7 @@ Requires: libKF5AkonadiContact5 = %{version} Requires: libKF5ContactEditor5 = %{version} Requires: cmake(KF5Akonadi) Requires: cmake(KF5Contacts) +Requires: cmake(Qt5Widgets) >= 5.12.0 Obsoletes: akonadi-contacts-devel < %{version} Provides: akonadi-contacts-devel = %{version} diff --git a/akonadi-contacts-19.12.1.tar.xz b/akonadi-contacts-19.12.1.tar.xz deleted file mode 100644 index 4cc43c7..0000000 --- a/akonadi-contacts-19.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fbca91b3251d57291629e441ecf5cdd9b71a56f74f05f6c55a428402d3b4c91 -size 394300 diff --git a/akonadi-contacts-19.12.1.tar.xz.sig b/akonadi-contacts-19.12.1.tar.xz.sig deleted file mode 100644 index 7f23a3c..0000000 --- a/akonadi-contacts-19.12.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl4T8WkACgkQ29LOiT4t -HIfPrQf+KLh5xa6SlgrUNDnQQEn/E0Kq6ZXH/mJzviefkhhbmWCAG+wJCE+SU2x/ -G3XS3eHozES3u2LmJMzTN2xbwXR7QnVOhliNV6lTMaP9OX6hD1x16OMWS4PYgUh3 -031nHV+Esq5jEFEq0V4Eme4FqOj9XZXKrtGtcPAUJxCgYAlReGKeDqZ1WYXoxQ1a -X6dblSnnhlw7nG5bodyd3kztfrLR66r1qJA6dPI9J5eW1voLaykBLriK2VQpCe/v -PS7aTaC3Hx56NQRDZQgSuQU0DPe1o/bbVHESDkI69rDPmYeJUqkMASf+5tlGnyJ/ -JHXE2nLhPNWvokli70+YIerswOX0kg== -=/+g4 ------END PGP SIGNATURE----- diff --git a/akonadi-contacts-19.12.2.tar.xz b/akonadi-contacts-19.12.2.tar.xz new file mode 100644 index 0000000..ed874dd --- /dev/null +++ b/akonadi-contacts-19.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ffb88875661756476939c2145af731274b13f986f6c66a7fd3eafcd05eb4f8b +size 392752 diff --git a/akonadi-contacts-19.12.2.tar.xz.sig b/akonadi-contacts-19.12.2.tar.xz.sig new file mode 100644 index 0000000..cd76cd4 --- /dev/null +++ b/akonadi-contacts-19.12.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl45NC0ACgkQ29LOiT4t +HIfBlwf/aHcuxN3O7xbOG+xdXTUQM45Zoz9hLoVdZwvqF9IqaWhR35SKiqZQWVYa +5Tp08VIH3dqEFoGfg3vkC3Ldlzq7QfhLlIEVh5q+8avTHJfSlOvEsn/PVzZnu9hl +Zit8kI8GbiOKwDt/akTyjVdLdhl5HCmqGZBoSwjpYcNyNuR90czV8G3T/JTRRrm6 +Dr9ku/NSfNAMdf2jH1hEMTaoZCJ0DV+YN3TNsTe7OYlDwq2ITBonveTuyxtoZQ6K +OdsjOfGoXJziHHbRX5+O5OCHR7wKQQqpawZI/tO1ZI+4AEypF+N78VVWB9SKyWeS +ymQglcCeNDb/dk+v7sBA9mx3wmuaaQ== +=8Z/u +-----END PGP SIGNATURE----- From 0a659975f08b9f1fbdac7c409d3a7d26cd8ad06f14d3f62e8cc2261399d5e759 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 7 Feb 2020 08:37:50 +0000 Subject: [PATCH 2/2] use %cmake_build OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-contact?expand=0&rev=138 --- akonadi-contact.changes | 5 +++++ akonadi-contact.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/akonadi-contact.changes b/akonadi-contact.changes index 6c8711d..ac25e0c 100644 --- a/akonadi-contact.changes +++ b/akonadi-contact.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 7 08:36:45 UTC 2020 - Christophe Giboudeaux + +- Replace %make_jobs with %cmake_build. + ------------------------------------------------------------------- Wed Feb 5 06:28:38 UTC 2020 - Luca Beltrame diff --git a/akonadi-contact.spec b/akonadi-contact.spec index 2976035..ed8192b 100644 --- a/akonadi-contact.spec +++ b/akonadi-contact.spec @@ -115,7 +115,7 @@ to develop KDE PIM applications. %build %cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} -%make_jobs +%cmake_build %install %kf5_makeinstall -C build