From 2a9c7a9792bde7dde41fca7d33de0750f964bf23adbd830578a78fbbe87fa3b4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 21 Nov 2020 12:58:50 +0000 Subject: [PATCH] 20.12 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/mailimporter?expand=0&rev=175 --- mailimporter-20.08.3.tar.xz | 3 --- mailimporter-20.08.3.tar.xz.sig | 11 ----------- mailimporter-20.11.80.tar.xz | 3 +++ mailimporter-20.11.80.tar.xz.sig | 16 ++++++++++++++++ mailimporter.changes | 7 +++++++ mailimporter.spec | 18 +++++++++--------- temporarily_fix_build.diff | 12 ++++++++++++ 7 files changed, 47 insertions(+), 23 deletions(-) delete mode 100644 mailimporter-20.08.3.tar.xz delete mode 100644 mailimporter-20.08.3.tar.xz.sig create mode 100644 mailimporter-20.11.80.tar.xz create mode 100644 mailimporter-20.11.80.tar.xz.sig create mode 100644 temporarily_fix_build.diff diff --git a/mailimporter-20.08.3.tar.xz b/mailimporter-20.08.3.tar.xz deleted file mode 100644 index 91d6bf5..0000000 --- a/mailimporter-20.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00c14076461c437b475375a928cf38a05843e710ab6e313a9fb429d0f173de70 -size 541548 diff --git a/mailimporter-20.08.3.tar.xz.sig b/mailimporter-20.08.3.tar.xz.sig deleted file mode 100644 index 781e458..0000000 --- a/mailimporter-20.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqkEACgkQ29LOiT4t -HIcCKgf+LjdzX6koLUUXoxM/aSLJ3NQL7teYiNs7BGr0qPDCHcNmCzJyQkW9SOLt -Ag819/OtXFIfdszGK5hWyaCapxdnJ0mcaQYHUvq5N3Um8XqQ3FR5h7R9R1Bhh9xt -MrOv4e9ooEvvIdakk/BHSeUk5FkiOIe9GDG7ez+8U2u8gFBOflsLoyFoYky2zH0t -hqIvI2UpJ8EFUEvIxDgHjFJmWxxRvZRwMabSMBtezdV7IY7C+mgu4FPn4zi8xbBi -uPG48wvu0Fedco97jqy+BMOUAXHc30vm3vDNo0ANB7ABJn1Awf4/CJKyeojYzVVy -fINxI9s+MfZKKjB6dp1XspfCF0YtFg== -=TYQp ------END PGP SIGNATURE----- diff --git a/mailimporter-20.11.80.tar.xz b/mailimporter-20.11.80.tar.xz new file mode 100644 index 0000000..1319ff7 --- /dev/null +++ b/mailimporter-20.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:864ee30bbdc52685bc6f383c65459757ea51f609877dfa26a10e00e01049b1a9 +size 548388 diff --git a/mailimporter-20.11.80.tar.xz.sig b/mailimporter-20.11.80.tar.xz.sig new file mode 100644 index 0000000..88063b5 --- /dev/null +++ b/mailimporter-20.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uooUACgkQOmpNuDnq +ptd6hBAApsyJACORvD46M/0bn9Bdt+qrLTX2E6xnzyvtWeH3wCoLRp2kgGwx5vrI +E71USwvV5nQmXrm3ywO7ePttXCVz/4PD43v8tFdkGusivzC+pOGvFD/LTokfkeor +dFNDyRXR7T0rycb1qKoH90nw4N+3qX1YJmlmev45eCIZeYrPSdsjxri6kvBZJcIL +vZrdGXrxQxfWdHlOPpi7WC4Da1Kg1kdxFu93yAWKVBbIkeAmVMj64bp0hlVTMEu9 +qpONm0hBJlGfJAnBRlgG/qFJwr+r9AC3RkotBbBGoMIhjQ5P04DPUEi/4HFdwlBr +rGWLdcUO8brmqF5nNCZnbrFUqaW11wFkY6nT2Qv3d4R2d8TOug7TIks2uYDD5ZOT +RSBNe0jQJKyb2nAg0nYFnjE9Atwhrb6hU0LFqUtUL9uqKxhh820kj5JprX8LJs5b +SSCOEe3X1T2s+8S3TGo7aVvUS6NIVot2Nix3u5r8LBv0fyumbdXe76+ujtteBA0w +vwuEpku8DzX7pM6n5WF7KIk8GfSMbZ5f7Hb1S2EpfSChzmiQr3i+WVS6gUaPm4B6 ++olEUmiU7/B1qNlHnpJmAokueV/vNUkEMo7k4UjbeL13pdXmpM+LKBvmkz5PryLS +ujBr/LeOwWdVBBG2fbPlHzpshMFmNqVQHbAmWp7MrONkVDWwL78= +=Kuhx +-----END PGP SIGNATURE----- diff --git a/mailimporter.changes b/mailimporter.changes index 056b2bc..ebc79f0 100644 --- a/mailimporter.changes +++ b/mailimporter.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 14 00:03:06 UTC 2020 - Christophe Giboudeaux + +- Update to 20.11.80 + * New feature release +- Too many changes to list here. + ------------------------------------------------------------------- Thu Nov 5 22:47:51 UTC 2020 - Luca Beltrame diff --git a/mailimporter.spec b/mailimporter.spec index 3ecba8f..498d051 100644 --- a/mailimporter.spec +++ b/mailimporter.spec @@ -16,18 +16,18 @@ # -%define kf5_version 5.66.0 +%define kf5_version 5.75.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: 20.08.3 +Version: 20.11.80 Release: 0 Summary: Mail import functionality for KDE PIM License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Akonadi) @@ -46,7 +46,7 @@ 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/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif Recommends: %{name}-lang @@ -110,7 +110,7 @@ used by KDE PIM applications to import data from other mail formats %postun -n libKF5MailImporterAkonadi5 -p /sbin/ldconfig %files devel -%license COPYING* +%license LICENSES/* %{_kf5_cmakedir}/KF5MailImporter/ %{_kf5_cmakedir}/KF5MailImporterAkonadi/ %{_kf5_includedir}/MailImporter/ @@ -125,21 +125,21 @@ used by KDE PIM applications to import data from other mail formats %{_kf5_mkspecsdir}/qt_MailImporterAkonadi.pri %files -n libKF5MailImporter5 -%license COPYING* +%license LICENSES/* %{_kf5_libdir}/libKF5MailImporter.so.* %files -n libKF5MailImporterAkonadi5 -%license COPYING* +%license LICENSES/* %{_kf5_libdir}/libKF5MailImporterAkonadi.so.* %files -%license COPYING* +%license LICENSES/* %{_kf5_debugdir}/mailimporter.categories %{_kf5_debugdir}/mailimporter.renamecategories %if %{with lang} %files lang -f %{name}.lang -%license COPYING* +%license LICENSES/* %endif %changelog diff --git a/temporarily_fix_build.diff b/temporarily_fix_build.diff new file mode 100644 index 0000000..a436399 --- /dev/null +++ b/temporarily_fix_build.diff @@ -0,0 +1,12 @@ +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)