diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kmail-account-wizard-23.08.4.tar.xz b/kmail-account-wizard-23.08.4.tar.xz deleted file mode 100644 index acf8d3d..0000000 --- a/kmail-account-wizard-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca20565754bfcdc0f3c00b23e0a12677cec131fbc45f28061839d3152f60c116 -size 185668 diff --git a/kmail-account-wizard-23.08.4.tar.xz.sig b/kmail-account-wizard-23.08.4.tar.xz.sig deleted file mode 100644 index d8e2907..0000000 --- a/kmail-account-wizard-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8LEACgkQu0YzUNbv -Me+DPw/9HczFEOZaYlJaXE71+ix7kGQZT28cjAAn3hmyIzOeMk3ouF9qx2LsxsSQ -MFdowJoPOaHdWgmLOIwBme9OaQDFEJVv18CfJsvaO2zvl3qJqm0zTrm1RX7kAHZ5 -4CQA2CHtCtGjLy2u7cRXng8WFxPSAlV6Ayo/4E9EibLxQYTtF5RAS2EMZvKrfe4r -sQAbNE2sXPZ8kZLsWtSGhc5Pf9HIBoqYmELFXkc4ezdkpd7EfeiviPKU/IWbklOW -8L0gjxVfHDZxcvETHnG4EOl+GLqHwPpSrrm56qH4+kQuWfs15HnftOinDRha4uxg -RhMfq5w0UpahNu/7Tel7bwb1e97cRD2WYMo6P60u3aTYStiCJZYiIE0mt1+WqOAW -PRKR6fygx/3vaWNarLupJXnN0EGVc2XtZbPwk1qUTaX/Z5sWkOs6072DZaJB08lJ -ZI9OGBMMdS90S8Tyc/hIegEno74HaJRc5GkVSMlgHM962LNsuQVH6c9xB+Wd6IhR -lPn6i4xWtRFyDktPOxLOMVL49ifjqjpEm6OpxeIn694ALPb0gpyprFCVlgeBbe1Q -j/v70FoZ1Yyo1NOgP9E9oueRFEDpu8nIk5xsrWpAZab7LoHaHx1oMP6+nqkhJaXL -oAA4XtRuGhlOi2S3kjNcQQ1pkMhOXTnHyQ4/v8cRevmTd0uTUaE= -=PjN7 ------END PGP SIGNATURE----- diff --git a/kmail-account-wizard-24.01.95.tar.xz b/kmail-account-wizard-24.01.95.tar.xz new file mode 100644 index 0000000..d7d1a95 --- /dev/null +++ b/kmail-account-wizard-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8acfd11352a091b5d70bd4baf6b63b0313a00dbb1f3e1ef30f3ea6a75ea436d3 +size 168900 diff --git a/kmail-account-wizard-24.01.95.tar.xz.sig b/kmail-account-wizard-24.01.95.tar.xz.sig new file mode 100644 index 0000000..f035f88 --- /dev/null +++ b/kmail-account-wizard-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW4484ACgkQOmpNuDnq +ptc65g/+KELdi4Y3Jiijkl572e9luBr7+HlcUm769mPF26RUYnUmdAJnSD9TA/vO +aELy1aImpVKdFM5KmjAo9RbK3R9n543dyZzHHcRWDngiqBTb3J7xxJwAI4oc+/4w +zYryXatjMg9DS/ypZ51OS+d2r1Bj9epS5zAHe5ToX+ikzV8CqzUtj3nvWcr9bg2b +21Di50lUj5vHWCA8jm6LNxpQT7bZ1gFTRqhry6RSl+Oj9WeH6Bw1Ckj4pOgeH3H+ +/O3Wslrs00P0vMwQDe7SAeiKEj5k9RXPcbZtDHSqRzIBpsj0QdWQPm1xd9kjsdZR +bzjcJxfRentge8mTHtDFfH3nJXQlbQUQ95ixJsTHUCYcOVQQ3nCgZSmZoaSzCPzJ +sMJJ/ELymKaEL40TZsDDo4pDuSJUs/N1jHUYIEkAlBJFOgpQYsjR63EJ6QdMWD1G ++Xn9e2gv7ydXiuSQU5y7/3DFkn1Y5pl4TzE1F2K3MVkr34rGVoLi2u7rtTL4fQWN +O2acPchhORvBhoD/8WZ1l8X661ufQf7Afz5+oZPLlaCsPyQTD2qD+TP3nBnsMGch +7GPI4K3Vl1kgjTQn9CtodeIYX9mZZP0ldtm4U53D1Jf45mIalyUj6KwLdOJ13+e4 +hNn1Cxiyp4/O1i9Tmz95K0RYfBPkFuoOc/UUeTwml7xdmzztYcQ= +=5V4X +-----END PGP SIGNATURE----- diff --git a/kmail-account-wizard.changes b/kmail-account-wizard.changes index 43f39ae..f46d4d6 100644 --- a/kmail-account-wizard.changes +++ b/kmail-account-wizard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:46 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:50 UTC 2023 - Christophe Marin diff --git a/kmail-account-wizard.spec b/kmail-account-wizard.spec index 11bcb16..6625d21 100644 --- a/kmail-account-wizard.spec +++ b/kmail-account-wizard.spec @@ -1,7 +1,7 @@ # # spec file for package kmail-account-wizard # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,51 +16,45 @@ # +%global __requires_exclude qt6qmlimport\\(org\\.kde\\.pim\\.accountwizard\\.* + +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 +%define kpim6_version 5.240.95 + %bcond_without released Name: kmail-account-wizard -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Account wizard for KMail License: GPL-2.0-or-later AND LGPL-2.1-or-later 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 %if %{with released} -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 -BuildRequires: extra-cmake-modules -BuildRequires: shared-mime-info -BuildRequires: cmake(KF5Codecs) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5Kross) -BuildRequires: cmake(KF5Libkleo) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5Service) -BuildRequires: cmake(KF5TextEditor) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KPim5Akonadi) -BuildRequires: cmake(KPim5AkonadiMime) -BuildRequires: cmake(KPim5IMAP) -BuildRequires: cmake(KPim5IdentityManagement) -BuildRequires: cmake(KPim5Ldap) -BuildRequires: cmake(KPim5Libkdepim) -BuildRequires: cmake(KPim5MailTransport) -BuildRequires: cmake(KPim5PimCommon) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5UiTools) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: libgpgmepp-devel +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KPim6Akonadi) >= %{kpim6_version} +BuildRequires: cmake(KPim6IdentityManagementCore) >= %{kpim6_version} +BuildRequires: cmake(KPim6MailTransport) >= %{kpim6_version} +BuildRequires: cmake(KPim6Mime) >= %{kpim6_version} +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6Keychain) +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} Obsoletes: akonadi_resources Obsoletes: kdepim # It can only build on the same platforms as Qt Webengine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 +ExclusiveArch: x86_64 aarch64 riscv64 %description An application which assists you with the configuration of accounts in KMail. @@ -71,25 +65,24 @@ An application which assists you with the configuration of accounts in KMail. %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name +%find_lang %{name} --all-name %files %license LICENSES/* -%{_kf5_applicationsdir}/org.kde.accountwizard.desktop -%{_kf5_bindir}/accountwizard -%{_kf5_bindir}/ispdb -%{_kf5_debugdir}/accountwizard.categories -%{_kf5_debugdir}/accountwizard.renamecategories -%{_kf5_knsrcfilesdir}/accountwizard.knsrc -%{_kf5_plugindir}/accountwizard_plugin.so -%{_kf5_sharedir}/akonadi/accountwizard/ -%{_kf5_sharedir}/mime/packages/accountwizard-mime.xml +%{_kf6_applicationsdir}/org.kde.accountwizard.desktop +%{_kf6_bindir}/accountwizard +%{_kf6_debugdir}/accountwizard.categories +%{_kf6_debugdir}/accountwizard.renamecategories +%{_kf6_libdir}/libaccountwizard.so.* +%dir %{_kf6_qmldir}/org/kde/pim +%{_kf6_qmldir}/org/kde/pim/accountwizard/ %files lang -f %{name}.lang