From 03fd66dcc8dd66be69ccff933b743533a0c98cfe5d394352b3ebf14ab69b6e15 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 19 Apr 2021 13:31:13 +0000 Subject: [PATCH] 21.04 release OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/mailimporter?expand=0&rev=190 --- mailimporter-21.03.90.tar.xz | 3 --- mailimporter-21.03.90.tar.xz.sig | 16 ---------------- mailimporter-21.04.0.tar.xz | 3 +++ mailimporter-21.04.0.tar.xz.sig | 16 ++++++++++++++++ mailimporter.changes | 9 +++++++++ mailimporter.spec | 18 +++++++++--------- temporarily_fix_build.diff | 12 ------------ 7 files changed, 37 insertions(+), 40 deletions(-) delete mode 100644 mailimporter-21.03.90.tar.xz delete mode 100644 mailimporter-21.03.90.tar.xz.sig create mode 100644 mailimporter-21.04.0.tar.xz create mode 100644 mailimporter-21.04.0.tar.xz.sig delete mode 100644 temporarily_fix_build.diff diff --git a/mailimporter-21.03.90.tar.xz b/mailimporter-21.03.90.tar.xz deleted file mode 100644 index 82a4059..0000000 --- a/mailimporter-21.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d63a1f3ece55e977d79567930a6382183f9c6307761cddd38077cde25ec29bb -size 552924 diff --git a/mailimporter-21.03.90.tar.xz.sig b/mailimporter-21.03.90.tar.xz.sig deleted file mode 100644 index cd38894..0000000 --- a/mailimporter-21.03.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsAACgkQu0YzUNbv -Me939g/9E7rUdGKf8g/+jFXSs1I4s2wzaI4vnkZRdA6CmCEnjfw029bTOOSwoi/l -AB3hF2Gj34thy+ws5Sy6rVRkrggURG9GeM/dQAejmwptwcgXWVNIZkyzW4IttH7t -lSb1pIZNdy9jV+8RvG4kxFa5lXsL/8uKJShyFamH1dWRVGJ9b6x3LB2PDLXUTF/P -pa/dVv6ImKiPjns3AIC1Y7fdZ8B9vKrrlH2q/ntGTlm2fR5pQIdRulIfdv123Tdq -3KZ0BPWDpSY/hYPs+7VKZaRI/hYsZFwEgVLapLuQYHkQhDduri5kAyhWsqp94iQa -nK4bDVWaO4Cplg8cu8LO4mf6LP5+Gl31Cowsy8go+IF8PnO5MHcQNrKQnIGQWqcy -jlDU5X8VARFAjep3Z5LmucXPeh92E8XyxA71NSOboU79DCpjWkVAQi6AAcvCjc1r -dclbUrbRE+cVJ6i7qr29z6EjowPGt2UPzebUjzvRBIJEfSKAuBIl3yEQSYH+V0Lo -2LvzmVUlT4LMGLNv+aE0/XWAdQ6sAwD+7kKv5kix6LBz7BK1wZV9wCh7PnBwvfG1 -q/YwqyhfJK8Q6w3pFEP+laR0zCR8fozXv+CZM15HDdBd+mys5byEgIQu3VAYFGM4 -qq8ZaNgNPgQdjrmQ1SHJwTywmQ3kDoPxOvWnArzDguOP0P3tk0I= -=rlov ------END PGP SIGNATURE----- diff --git a/mailimporter-21.04.0.tar.xz b/mailimporter-21.04.0.tar.xz new file mode 100644 index 0000000..6513a71 --- /dev/null +++ b/mailimporter-21.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:656ba4469a8d51a5c336e6b16dc5a976119102103535dba269fa65c60656fb1b +size 552884 diff --git a/mailimporter-21.04.0.tar.xz.sig b/mailimporter-21.04.0.tar.xz.sig new file mode 100644 index 0000000..4fefa50 --- /dev/null +++ b/mailimporter-21.04.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwkACgkQu0YzUNbv +Me/UmhAAkRYzSl5YK+403JSVafAeXlMTgnLgW6rav2VBSOPPxzmVKd6CSigJGdU6 +sXIJiyFjUJo8buQ9fFJejBHfJQR+grF1pmDIFx+K6dxLaP4vGEEz3h4tCPPklBp2 +8T6tiLbO3g7SZxmdbd5cDdTvM7Ts2PJQeTN2FXKCdkb4ckm6uXCJ+EIB4PR0oPTb +24/Ced391JoRR+2KWHLjH2kcuAcoVItT7KWPI50mp1R47WBDhwVNsPw4lRkttedy +7KOImZh7lD1JNVcyo0X8/2enaN4jL8xUg7guyyCDTpm+sq+87iyFA5Y2idB8raOq +IZxmQZeFx1/LHo/cesWQuWwx+hiUS6m9aEWAAxeqmfqnl5gnAdBOKbT8nap7M4QE +hfvTJM0tS+UnnQQe6MEw/b3MdRI6of9o6Fj3J8BpDmurrwObayPwjx0MaDEUmnBK +qxyvoqGc30FL23IdVlKa6qb2mh1Fnk7+u0GyLHusdxpl891pkWl6Z4qtmw6MEyJ3 +L4lf4W6PjS1R10OWarVdOmAtUHUM5Shu/2uOl0pITTrba7BbisshOI3dDQWm5Ujs +1RKRVv8hzaI0iUGfp/7tvLNfjLPrgmqeyzX6fUQQwf2BMy9PvkRFcAMaZUtz+aZN +aHQKbT9TjGePLjsUe9k8+i/uF4eTAJAR0Nuw2Ya2IZoLfqIt5WQ= +=sWg/ +-----END PGP SIGNATURE----- diff --git a/mailimporter.changes b/mailimporter.changes index 141c44a..a39b85a 100644 --- a/mailimporter.changes +++ b/mailimporter.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 16 16:13:14 UTC 2021 - Christophe Giboudeaux + +- Update to 21.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/21.04.0 +- No code change since 21.03.90 + ------------------------------------------------------------------- Fri Apr 9 17:41:40 UTC 2021 - Christophe Giboudeaux diff --git a/mailimporter.spec b/mailimporter.spec index 95f2e76..6cb9796 100644 --- a/mailimporter.spec +++ b/mailimporter.spec @@ -16,18 +16,22 @@ # -%define kf5_version 5.75.0 +%define kf5_version 5.79.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: mailimporter -Version: 21.03.90 +Version: 21.04.0 Release: 0 -Summary: Mail import functionality for KDE PIM +Summary: Mail import functionality for KDE PIM applications License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://www.kde.org -Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Akonadi) @@ -45,10 +49,6 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 -%if %{with lang} -Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif Recommends: %{name}-lang %description @@ -91,7 +91,7 @@ used by KDE PIM applications to import data from other mail formats %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build diff --git a/temporarily_fix_build.diff b/temporarily_fix_build.diff deleted file mode 100644 index a436399..0000000 --- a/temporarily_fix_build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 80d0bc8..77a6e94 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ find_package(KF5Archive ${KF5_MIN_VERSION} CONFIG REQUIRED) - find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) - find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) - find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -+find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) - - find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) - find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)