From f9c094a28a5c5be7aa840e6d6d4d7077178c65c663a876ea9e10fab6ade1f23e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:53 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=13 --- applications.keyring | Bin 6936 -> 5710 bytes merkuro-23.08.4.tar.xz | 3 - merkuro-23.08.4.tar.xz.sig | 16 ---- merkuro-24.01.95.tar.xz | 3 + merkuro-24.01.95.tar.xz.sig | 16 ++++ merkuro.changes | 6 ++ merkuro.spec | 158 +++++++++++++++++------------------- 7 files changed, 100 insertions(+), 102 deletions(-) delete mode 100644 merkuro-23.08.4.tar.xz delete mode 100644 merkuro-23.08.4.tar.xz.sig create mode 100644 merkuro-24.01.95.tar.xz create mode 100644 merkuro-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/merkuro-23.08.4.tar.xz b/merkuro-23.08.4.tar.xz deleted file mode 100644 index d97981b..0000000 --- a/merkuro-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2123c7a1bda410ab8c8168311bc7a6e72abc51ab2408bef7c4da991e35eaee5 -size 981940 diff --git a/merkuro-23.08.4.tar.xz.sig b/merkuro-23.08.4.tar.xz.sig deleted file mode 100644 index 20f243f..0000000 --- a/merkuro-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8XsACgkQu0YzUNbv -Me8alg/8DBGMCKlWjfiiowYaQirBTkqHoqX3nHnwT2ih0tGTzzfeYVj5FMJk3XXc -DtfBCYsZhj9lldyMK5bLlGYtka1puk4gTzxJym1dQjmYAE7RFHpczW1C6p0msO3A -PAFYWTrrmx0C2BFaENOHE7sagkGRV/36AOEH3ywCGHvByq8VOjd8BzSvz9++CrnZ -PKBkBoQ9vRXctjIzPE4msC60pNpeLFdRXZdLiLQaxePHkH81HrWsalKvwLCuabKl -YhVtkzpQCAuk9yPbZWEumShIR1NfRNbY1/hCmOyEizmaXsv+OJBMXM4WuUZnr/q/ -udV2P0V64uhlvuDWOSXe3XOCjrP4JCgpIMzc6ztjkRpk6UK/A+0RwWA/ATDKrFET -l3t8myMlZBYEf7lcyjZDq4FnzJirHfhVYwB85TuigXzyybIyc9HrDUQrV70usV33 -sOzJ7w9rZ1wXNKkgsgyl2yoC+7cHrftlfRp2c6LrfPvc4hfOmN3ZOVJqMQXcuDnk -WxytzOzIFgd1J+I1yOOCriptg2SIkwsLrMs7E5mfqCAYFbHf7RKAp8vDHzzNZrru -bSanFJPWaaDYl+gAfvCcfJ4F1NjPgaE4Lt2pu4jaBIsi+xeiUVV0KCNCX06XCAAI -R157vi9uyzwZfuBZX1suo6y3KTRKqGFrMslJgdkdmwRRkaKMb6g= -=jmpG ------END PGP SIGNATURE----- diff --git a/merkuro-24.01.95.tar.xz b/merkuro-24.01.95.tar.xz new file mode 100644 index 0000000..75d36b9 --- /dev/null +++ b/merkuro-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72ca5d7064f1bc0ee0da6449f6403eb024cb7f58283f9398904e43fd25e4ddd3 +size 729320 diff --git a/merkuro-24.01.95.tar.xz.sig b/merkuro-24.01.95.tar.xz.sig new file mode 100644 index 0000000..9d1baf3 --- /dev/null +++ b/merkuro-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45KUACgkQOmpNuDnq +ptf8fQ/8D1FTyZ9L2xdTJkS//B/mtTzNrifXaMBGJjFUGHuLTD26YuSbgndo798b +El8ZxB+3FgalPAU/htdU4tQRJf2ahx2B4CXXHfdFrYnTnVVdsIdhV5gTnXAvI40j +lc2nA0CPcpbm3prRJr1tgcm+PC1S/HOsP3dEWEQsPoxJPwiEvaiYCc5t4sykijV/ +Rhb63yZY1V0UD/QEHUx3w0QhrC2XiFWecvMzbV+D1HmcjseB8+4O0Zm2pX7vBYzS +XxEfV6QA3sAWtOhHlIYYEdX9MWu9GOerDaCu5QecLILX1XDNrlxcZ7PeY1Igqc4N +ddv+JhMNo9WtuKGbTt8ah6gQ4uZPC2xwCDdTIqPPE3eZCEPpRgMIIpWLUsW/bAWn +M7wLhVFVRr+V2khmtGkQit43WjP6sqqOjjqUh7u4V4Rsi9CxLrXrb2qhxlxtP7tP +cVJ7THD+jXWiwtc1O4Sw5IsYe0rZL2GlyWc8q9O6vOPCiJIjv+2Fp5M7zvMQKaOt +6VV6Z+wjfzlcht9g0j4x8eGDfaAAEBhKICj6097uON9h0ho7CRWMQPQTZWVvmNHK +RrxA+MBlKkdCzHrvtr9t8bo77n05B9ilTJxJptz6TUb/WYcwzAhI/H6ExoYLLQFU +hZOdUsdLAvPOfvGMN+eX8ZE0Opp8le4REPvSpWywG14KTfaBLyQ= +=5txH +-----END PGP SIGNATURE----- diff --git a/merkuro.changes b/merkuro.changes index e9bb4e6..ae5f056 100644 --- a/merkuro.changes +++ b/merkuro.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:58 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:32 UTC 2023 - Christophe Marin diff --git a/merkuro.spec b/merkuro.spec index ae40452..07691b1 100644 --- a/merkuro.spec +++ b/merkuro.spec @@ -1,7 +1,7 @@ # # spec file for package kalendar # -# 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,82 +16,80 @@ # -%global __requires_exclude qmlimport\\((org\\.kde\\.merkuro\\.1|org\\.kde\\.raven).* -%define kf5_version 5.105.0 +%global __requires_exclude qt6qmlimport\\((org\\.kde\\.merkuro|org\\.kde\\.raven).* + +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 +%define kpim6_version 5.240.95 +%define plasma6_version 5.27.80 + %bcond_without released Name: merkuro -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Calendar Application License: GPL-3.0-only URL: https://apps.kde.org/merkuro.calendar -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 >= %{kf5_version} -%if 0%{?suse_version} == 1500 -BuildRequires: gcc10-c++ -BuildRequires: gcc10-PIE -%endif -BuildRequires: hicolor-icon-theme +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: pkgconfig -BuildRequires: cmake(KF5CalendarCore) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5Contacts) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Kirigami2) -BuildRequires: cmake(KF5KirigamiAddons) -BuildRequires: cmake(KPim5PimCommonAkonadi) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5QQC2DesktopStyle) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KPim5Akonadi) -BuildRequires: cmake(KPim5AkonadiCalendar) -BuildRequires: cmake(KPim5AkonadiContact) -BuildRequires: cmake(KPim5AkonadiMime) -BuildRequires: cmake(KPim5CalendarSupport) -BuildRequires: cmake(KPim5EventViews) -BuildRequires: cmake(KPim5MailCommon) -BuildRequires: cmake(Qt5Core) >= 5.15.2 -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5QuickControls2) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5QuickTest) +BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version} +BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6Contacts) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6ItemModels) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} +BuildRequires: cmake(KF6KirigamiAddons) +BuildRequires: cmake(KF6QQC2DesktopStyle) >= %{kf6_version} +BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(KPim6Akonadi) >= %{kpim6_version} +BuildRequires: cmake(KPim6AkonadiCalendar) >= %{kpim6_version} +BuildRequires: cmake(KPim6AkonadiContactCore) >= %{kpim6_version} +BuildRequires: cmake(KPim6AkonadiMime) >= %{kpim6_version} +BuildRequires: cmake(KPim6CalendarUtils) >= %{kpim6_version} +BuildRequires: cmake(KPim6IdentityManagementQuick) >= %{kpim6_version} +BuildRequires: cmake(KPim6MailCommon) >= %{kpim6_version} +BuildRequires: cmake(KPim6MailTransport) >= %{kpim6_version} +BuildRequires: cmake(KPim6MimeTreeParserCore) >= %{kpim6_version} +BuildRequires: cmake(Plasma) >= %{plasma6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6DBus) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickTest) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} BuildRequires: pkgconfig(gpgme) Requires: kalendarac Requires: kdepim-addons Requires: kdepim-runtime # No automatic qmlimport requires for embedded resources :-/ -Requires: kirigami2 >= %{kf5_version} -Requires: qt5qmlimport(QtGraphicalEffects.1) -Requires: qt5qmlimport(QtLocation.5) -Requires: qt5qmlimport(QtQuick.Dialogs.1) -Requires: qt5qmlimport(org.kde.kitemmodels.1) +Requires: kf6-kirigami-imports >= %{kf6_version} +Requires: kf6-kitemmodels-imports >= %{kf6_version} +Requires: qt6-declarative-imports >= %{qt6_version} Provides: kalendar = %{version} Obsoletes: kalendar < %{version} -# Got vendored for now -# Requires: qt5qmlimport(org.kde.kirigamiaddons.treeview.1) -# kalendar has a runtime dependency on QtWebEngine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 +# merkuro has a runtime dependency on QtWebEngine +ExclusiveArch: x86_64 aarch64 riscv64 %description Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...). %package plasmoid Summary: Plasma widget to view address book contacts -Supplements: (%{name} and plasma5-workspace) -Requires: %{name} = %{version} +Supplements: (merkuro and plasma6-workspace) +Requires: merkuro = %{version} Provides: kalendar-plasmoid = %{version} Obsoletes: kalendar-plasmoid < %{version} @@ -104,44 +102,38 @@ This package provides a Plasma widget to view address book contacts. %autosetup -p1 %build -%if 0%{?suse_version} == 1500 - export CXX=g++-10 -%endif +%cmake_kf6 -%cmake_kf5 -d build -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name +%find_lang %{name} --all-name %files %license LICENSES/* -%dir %{_kf5_qmldir}/org/kde/merkuro/ -%{_kf5_applicationsdir}/org.kde.merkuro.contact.desktop -%{_kf5_applicationsdir}/org.kde.merkuro.mail.desktop -%{_kf5_applicationsdir}/org.kde.merkuro.calendar.desktop -%{_kf5_bindir}/merkuro-mail -%{_kf5_bindir}/merkuro-calendar -%{_kf5_bindir}/merkuro-contact -%{_kf5_debugdir}/akonadi.quick.categories -%{_kf5_debugdir}/merkuro.categories -%{_kf5_debugdir}/merkuro.contact.categories -%{_kf5_iconsdir}/hicolor/*/apps/org.kde.merkuro.*.png -%{_kf5_qmldir}/org/kde/akonadi/ -%{_kf5_qmldir}/org/kde/merkuro/contact/ -%{_kf5_qmldir}/org/kde/merkuro/calendar/ -%{_kf5_qmldir}/org/kde/merkuro/mail/ -%{_kf5_qmldir}/org/kde/merkuro/components/ -%{_kf5_appstreamdir}/org.kde.merkuro.calendar.metainfo.xml -%{_kf5_appstreamdir}/org.kde.merkuro.mail.metainfo.xml -%{_kf5_appstreamdir}/org.kde.merkuro.contact.metainfo.xml + +%{_kf6_applicationsdir}/org.kde.merkuro.calendar.desktop +%{_kf6_applicationsdir}/org.kde.merkuro.contact.desktop +%{_kf6_applicationsdir}/org.kde.merkuro.mail.desktop +%{_kf6_appstreamdir}/org.kde.merkuro.calendar.metainfo.xml +%{_kf6_appstreamdir}/org.kde.merkuro.contact.metainfo.xml +%{_kf6_appstreamdir}/org.kde.merkuro.mail.metainfo.xml +%{_kf6_bindir}/merkuro-calendar +%{_kf6_bindir}/merkuro-contact +%{_kf6_bindir}/merkuro-mail +%{_kf6_debugdir}/akonadi.quick.categories +%{_kf6_debugdir}/merkuro.categories +%{_kf6_debugdir}/merkuro.contact.categories +%{_kf6_iconsdir}/hicolor/*/apps/org.kde.merkuro.*.png +%{_kf6_qmldir}/org/kde/akonadi/ +%{_kf6_qmldir}/org/kde/merkuro/ %files plasmoid -%dir %{_kf5_plasmadir}/plasmoids -%{_kf5_appstreamdir}/org.kde.merkuro.contact.appdata.xml -%{_kf5_plasmadir}/plasmoids/org.kde.merkuro.contact +%dir %{_kf6_plasmadir}/plasmoids +%{_kf6_appstreamdir}/org.kde.merkuro.contact.appdata.xml +%{_kf6_plasmadir}/plasmoids/org.kde.merkuro.contact %files lang -f %{name}.lang