From 3af66423e0a538d8cee586f16a0e5dda4b6b2323def4e1aacfd0a5b9859219da Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:25 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmail-account-wizard?expand=0&rev=233 --- applications.keyring | Bin 6936 -> 5710 bytes kmail-account-wizard-23.08.4.tar.xz | 3 - kmail-account-wizard-23.08.4.tar.xz.sig | 16 ----- kmail-account-wizard-24.01.95.tar.xz | 3 + kmail-account-wizard-24.01.95.tar.xz.sig | 16 +++++ kmail-account-wizard.changes | 6 ++ kmail-account-wizard.spec | 87 +++++++++++------------ 7 files changed, 65 insertions(+), 66 deletions(-) delete mode 100644 kmail-account-wizard-23.08.4.tar.xz delete mode 100644 kmail-account-wizard-23.08.4.tar.xz.sig create mode 100644 kmail-account-wizard-24.01.95.tar.xz create mode 100644 kmail-account-wizard-24.01.95.tar.xz.sig diff --git a/applications.keyring b/applications.keyring index 9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d..299808814995a7df8af874c79c21b829723206c7161c5b8fa8cfe0dc780a9ae5 100644 GIT binary patch delta 575 zcmV-F0>J&4HqI=t5dyPq1l9zz5CU8RvqK3p1hYUAZvua0`acK-2@=uIWdI5Z5ISm2 zxH;;k*T+;40GB(?H*yWMAZ-``_*e|R_d~@}b zcPza!RGVGD`Qt>8z4Pv1^*u-Q*}3*efL?z!Y^kQjR0ksk;$vLvv{#+63bg|LoJ93iAJM|vY1pr z#y5X)sUQLPg*L0NvWwfTJb9+63+Zy9PoTA2KzeN+WNLXq?(tU_2}vf0yAp5l52p1* z+mdZB^0;_=jDVe1(_3ht&hY0-j5eC(DU{HR<36y~o!!_x&iZfuJA_{_mEU9AWUUr zBgW_I!d=}VU3w&My`e#-Y5PhrU9(!`D56M>;}n-%Jak#+e{Ge}`Qb??shHd*cf?Sh zU4L$vB+`ly$;r{NiyS&+*lXh4+n?lLY22HZF0~(MTHp!salP&qmaOfwBNjL5hkV14tv8{-*&4JY30ft zQC0}Kr*u;^3RpiEEpiTf6BjdVsr^UAOIKoJ$?Q0{fqfjBi)#Q80RREC9z$qyX>)XM zaA+V#Wn*g~JY!~MV{1TbWMwXIa%Vn?0Zs%H0SEv%79j-kGIiv?5U;`CX%wd0($0xK zEgXjh0$EX{Mw77*8-D-_2@u=T&WS!P9EW*l2mB30+1^wyY6r5i$f8mrSjnMz8Y^+9 zKG1k2msyNa4sCq#{w-YKu2T#fxHST4G9FE8XPPX|wbX-Q|J%>pIA7LQQQ$$uhOf4e zYn2ceenhD(05I z7FQ$*Uwa2i6UWq8=9!B=*(IwWx%aI}d$NZ}g=%V&e;bh3`zOu| zQ|xo=$bTdis&<}zlh$;MS3wA8)|7WmrW}s|b%%a64 z53A>GNbf>23V-xl6xZ*}08T{4&K_t>0)jFIxd9CXSy7}$0SExgl%4Zmt=xRZe#wo= zx-e-0{fDVtT&%89@liy&tG>4Mmr|8gr$UcL6z_KIWJ***%K*!l;Pvd?9mHv4t zE{As`oojkypzerLlLSiv+zIaxt~R!xgsJTo9)C9*ntxvwl_8C0y7pU43kXLkEZQ)H zrAi9pc6@feKS20FvfC^N$1@DUHBSyJ?SGNNF>6Ag$h2Gfe?UldOcCR)q=d0By|vLd zS@W~*n9=$PY><-OP}vLH9J0F1RKGvv9TEgd&;7>e@tm%&ikFsxJKy9r^ zN-vhXqkoaNP48HT0iZagYFb&`v!+Xk<$4}*v;^((boVFI*8mX#00D^sHUt;}2ml}! zAq4U=b>zPgufgAG6sFtK&WS!P9ESx0Sy7}$0vikf3JDO~($0xKEgXkw69@o~SZO!L zc>v}|PYBq%^R(dy|8@oIcMS;t)u-ivv|q}v$$yL%ky4>C$u!8jr{1`fb`wne&v^{X z&0X5cBqOWf$FrfunTdPe=`)mJoa~_G${V0UIl2O)ZK|cfS1B5c8O4vt-`Q(W8eL(k znY%bS|v98{7aL68cnGQwrGAnL0JiK=7X={#;jGuS(5x zT3@KEDyEnLW{Qe8eA44yI=D#hxVs?&U5XgsY<-+hvRy?U%E~ z2+#9+dbO*F)->-IEF-%uaeF4|?U15jXUZJ?o%VAU;lS3z$W?#Y=QSiJ zo%rN5yd#%%xO+ngP;t@n)4HDo1JLtH5n=8~Z3FOgHyIy7Fz|L|xK`rNNw}}0vJ+Q3 zh9Di>Evd!oP(=5&CtVnlL8@$^KfF}}FZi@q(2cy@4UupNa0P>Yy)9Vp9^4oEjs_&2 z_XaqU4m6a|L?49)o*d%p(b#|e4HYFQ(~JHLti_hA0twdJ9$D1B^lPlJ7XoUrY;8{> z6)SGRqj0Zy`2$n77!NM6)ihJQEPNLj6Obmx!udS)#M2AQsuu4jkuw&&h5}fd#&RH( zXcJW5*9{;?R88R-JtfU?g{8XGpP%7Q@G&l8L;#EC(4j=@*jGp!s|OxQSakL>Mzm>T dFhI7^_lb;rB8RGZhpD!NUE`BDuCxCUPXtYPO@06X 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