From 064f42bac3d99933e4190a290d2fba93238d6a490afe8fd84cd3208cbba2e448 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:51 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/mailcommon?expand=0&rev=261 --- applications.keyring | Bin 6936 -> 5710 bytes mailcommon-23.08.4.tar.xz | 3 - mailcommon-23.08.4.tar.xz.sig | 16 ---- mailcommon-24.01.95.tar.xz | 3 + mailcommon-24.01.95.tar.xz.sig | 16 ++++ mailcommon.changes | 6 ++ mailcommon.spec | 139 +++++++++++++++++---------------- 7 files changed, 97 insertions(+), 86 deletions(-) delete mode 100644 mailcommon-23.08.4.tar.xz delete mode 100644 mailcommon-23.08.4.tar.xz.sig create mode 100644 mailcommon-24.01.95.tar.xz create mode 100644 mailcommon-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/mailcommon-23.08.4.tar.xz b/mailcommon-23.08.4.tar.xz deleted file mode 100644 index e0ff9e0..0000000 --- a/mailcommon-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ff8c12a6ae40e97f35603baffc43b34c6c725dedac1c0ebccd4474cf9fee987 -size 763028 diff --git a/mailcommon-23.08.4.tar.xz.sig b/mailcommon-23.08.4.tar.xz.sig deleted file mode 100644 index fa43351..0000000 --- a/mailcommon-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8PAACgkQu0YzUNbv -Me8a2xAAjSJd9iNgbl0VqINJ66P46R1dKjNISKdLxEIdAB3V/ZJcW52x8uQQvg/E -PX918NIRD+0NYj9aC9dcVIWytB9v0UylnIsm12ZZzaivGuHS0JEwiFR38EE/rq3+ -UNCFBhGl862KT6qpJjx1SG6CYL6dJ4k/RUBir/rJXCfurnk93akBA/4md3zX0Ir5 -U0izTL5D+wZAFKvEAyGY2uYbl29pxWTuMdWu6TDFZnvIFtkVRZxd0ish5DtXi4RX -RVkQhTXbx3gW3L5rYDZNNeiKapSJhKNtVLzk3ePmSbOVMtW8nquZD6Rvk8z3WTbD -K1R3nLhkslGNpVoOF8LZoRfXO1fPVFyFM/J+1L+WKuZs8escIyOsvZIrrVvebrXX -n44y3k2ORuHF0nj8tcD9gJb/6iW96vC5pGrTtPw/jsfPm7iEzF0DemiaQFby4j/p -oXJmM9z7bPKmh7aVlBvFE3TopN6hwdKeqkZ8aVMvbuN0MNkuE2vBsoQRIr9chKvl -Vn5f9kq5QKua9mh/X5geaJRXgLLQg+5n3qrVk/+XvOswUz/NscbLdPi0AdLXgI6L -iuF8/IjrfuUwfm2BaSdm9Hcma+5PQt/65Z21UGVDqBwBpF3HHNr7ZqR4B4x8LZLf -2BZ9mbcte47Sn51AP1YxuD4iyJ5znkO7Yv+Idvm6bD2RqasMPgE= -=jLzu ------END PGP SIGNATURE----- diff --git a/mailcommon-24.01.95.tar.xz b/mailcommon-24.01.95.tar.xz new file mode 100644 index 0000000..9b74e38 --- /dev/null +++ b/mailcommon-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f32af3357978af494650de438c7e55c60abcc9f60074153c7f21cfc55f6dffd +size 771916 diff --git a/mailcommon-24.01.95.tar.xz.sig b/mailcommon-24.01.95.tar.xz.sig new file mode 100644 index 0000000..fc9ea47 --- /dev/null +++ b/mailcommon-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45BEACgkQOmpNuDnq +pte0qw//catN+XdcVXSvj+0NaYtdSxv4c/ZeZIf+7lUpz6TS6zM+UR2McAO8q+D8 +AqK6YZI2srqjiASRIAKN/dEQMfhAu+9VKlvIxF8kJ0RfmGbfa+CZVHmypmTklR8p +cifZ3V6bvJgTVBzLCBheJg7wGbTa5zKt7P0s0H+x0hhxzfY7eEtXq95R0Fx96kLM +KGOkWuKANJEQwcU37ISiqBcIDfI5GPrm0m3JgaCUECTKdMW5kdA7VuY04vsZiwDK +plW+172eMkOsM2m1pw1KgeYRNh0VjQHByp5no1EdDbYgTzK8WNUSklkGYedHxRXj +s5PNrKvea2KJkQbAILobrG/wwhH+1QHC9bGaS7pysBU/J194V+W9THCx5amThKRM +0KczF84CBDkHeC9t5yk2bdryUcMbMAUp3XnRHxMiEkVDGiZcgtn9fG2AdF02JX8x +y6PEUSIywT0x1je7MBbxSoqx9tr6Ez2YZEoXCQiQRZgn2mxIYdI5vveSj4NY7BXr +lWOhqqSty4gzH1qq/hLKz3swQucDwRs+1DUqRAM284muBVlMIQHBmOuDmADk3cTl +pG1yd7q8cvNgu8bqCk5HRD3iYo0W7ZCwj32+sSfOc49ubG0XkVQc2m0HogpTZtln +qTLWfM0rpTC7Bkdb75DpCWwnZ7AX5W2nqO03sUUIEMfh7iSivz8= +=sLPM +-----END PGP SIGNATURE----- diff --git a/mailcommon.changes b/mailcommon.changes index cd8c7b4..f8db63b 100644 --- a/mailcommon.changes +++ b/mailcommon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:54 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:30 UTC 2023 - Christophe Marin diff --git a/mailcommon.spec b/mailcommon.spec index 48cda8b..5d10386 100644 --- a/mailcommon.spec +++ b/mailcommon.spec @@ -1,7 +1,7 @@ # # spec file for package mailcommon # -# 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,79 +16,87 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 +%define kpim6_version 5.240.95 + %bcond_without released -%define libname libKPim5MailCommon5 Name: mailcommon -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Base KDE PIM library for mail-handling applications License: GPL-2.0-only 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: kf5-filesystem -BuildRequires: xsltproc -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Codecs) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5SyntaxHighlighting) -BuildRequires: cmake(KF5TextWidgets) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KPim5Akonadi) -BuildRequires: cmake(KPim5AkonadiMime) -BuildRequires: cmake(KPim5Libkdepim) -BuildRequires: cmake(KPim5MailImporter) -BuildRequires: cmake(KPim5MailTransport) -BuildRequires: cmake(KPim5MessageCore) -BuildRequires: cmake(KPim5Mime) -BuildRequires: cmake(KPim5PimCommon) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5UiPlugin) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) +BuildRequires: doxygen +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KF6Archive) >= %{kf6_version} +BuildRequires: cmake(KF6Codecs) >= %{kf6_version} +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6ItemViews) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6SyntaxHighlighting) >= %{kf6_version} +BuildRequires: cmake(KF6TextCustomEditor) +BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(KPim6Akonadi) >= %{kpim6_version} +BuildRequires: cmake(KPim6AkonadiContactWidgets) >= %{kpim6_version} +BuildRequires: cmake(KPim6AkonadiMime) >= %{kpim6_version} +BuildRequires: cmake(KPim6IdentityManagementCore) >= %{kpim6_version} +BuildRequires: cmake(KPim6Libkdepim) >= %{kpim6_version} +BuildRequires: cmake(KPim6MailImporter) >= %{kpim6_version} +BuildRequires: cmake(KPim6MailTransport) >= %{kpim6_version} +BuildRequires: cmake(KPim6MessageComposer) >= %{kpim6_version} +BuildRequires: cmake(KPim6MessageCore) >= %{kpim6_version} +BuildRequires: cmake(KPim6MessageList) >= %{kpim6_version} +BuildRequires: cmake(KPim6MessageViewer) >= %{kpim6_version} +BuildRequires: cmake(KPim6Mime) >= %{kpim6_version} +BuildRequires: cmake(KPim6PimCommonAkonadi) >= %{kpim6_version} +BuildRequires: cmake(KPim6TemplateParser) >= %{kpim6_version} +BuildRequires: cmake(Phonon4Qt6) +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} +BuildRequires: cmake(Qt6UiPlugin) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Xml) >= %{qt6_version} # It can only build on the same platforms as Qt Webengine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 +ExclusiveArch: x86_64 aarch64 riscv64 %description The mailcommon library is a KDE PIM project to provide a framework to build applications which handle e-mail. -%package -n %{libname} +%package -n libKPim6MailCommon6 Summary: Common Mail library for KDE PIM applications License: LGPL-2.1-or-later -Requires: %{name} +Requires: mailcommon >= %{version} +Obsoletes: libKPim5MailCommon5 < %{version} -%description -n %{libname} +%description -n libKPim6MailCommon6 This package provides the mailcommon library, a base KDE PIM library to build email-handling applications. %package devel Summary: Development package for mailcommon License: LGPL-2.1-or-later -Requires: %{libname} = %{version} -Requires: cmake(KF5Completion) -Requires: cmake(KPim5Akonadi) -Requires: cmake(KPim5AkonadiMime) -Requires: cmake(KPim5Libkdepim) -Requires: cmake(KPim5MessageCore) -Requires: cmake(KPim5PimCommon) +Requires: libKPim6MailCommon6 = %{version} +Requires: cmake(KF6Completion) >= %{kf6_version} +Requires: cmake(KPim6Akonadi) >= %{kpim6_version} +Requires: cmake(KPim6AkonadiMime) >= %{kpim6_version} +Requires: cmake(KPim6Libkdepim) >= %{kpim6_version} +Requires: cmake(KPim6MessageComposer) >= %{kpim6_version} +Requires: cmake(KPim6PimCommon) >= %{kpim6_version} +Requires: cmake(KPim6PimCommonAkonadi) >= %{kpim6_version} %description devel This package contains the development headers for the mailcommon library. @@ -99,34 +107,31 @@ This package contains the development headers for the mailcommon library. %autosetup -p1 %build -%cmake_kf5 -d build +%cmake_kf6 -DBUILD_QCH:BOOL=TRUE -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name +%find_lang %{name} --all-name -%ldconfig_scriptlets -n %{libname} +%ldconfig_scriptlets -n libKPim6MailCommon6 %files -%{_kf5_debugdir}/mailcommon.categories -%{_kf5_debugdir}/mailcommon.renamecategories +%{_kf6_debugdir}/mailcommon.categories +%{_kf6_debugdir}/mailcommon.renamecategories -%files -n %{libname} +%files -n libKPim6MailCommon6 %license LICENSES/* -%{_libdir}/libKPim5MailCommon.so.* +%{_libdir}/libKPim6MailCommon.so.* %files devel -%dir %{_includedir}/KPim5 -%dir %{_kf5_plugindir}/designer -%{_includedir}/KPim5/MailCommon/ -%{_kf5_cmakedir}/KF5MailCommon/ -%{_kf5_cmakedir}/KPim5MailCommon/ -%{_kf5_libdir}/libKPim5MailCommon.so -%{_kf5_mkspecsdir}/qt_MailCommon.pri -%{_kf5_plugindir}/designer/mailcommon5widgets.so +%doc %{_kf6_qchdir}/KPim6MailCommon.* +%{_includedir}/KPim6/MailCommon/ +%{_kf6_cmakedir}/KPim6MailCommon/ +%{_kf6_libdir}/libKPim6MailCommon.so +%{_kf6_plugindir}/designer/mailcommon6widgets.so %files lang -f %{name}.lang