From 1fae179c86e3f75c93d52c1a67c1dded50b7ed16de4cd1fe207685fc8cf5be62 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:31 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolourpaint?expand=0&rev=195 --- applications.keyring | Bin 6936 -> 5710 bytes kolourpaint-23.08.4.tar.xz | 3 -- kolourpaint-23.08.4.tar.xz.sig | 16 -------- kolourpaint-24.01.95.tar.xz | 3 ++ kolourpaint-24.01.95.tar.xz.sig | 16 ++++++++ kolourpaint.changes | 6 +++ kolourpaint.spec | 67 +++++++++++++++++++------------- 7 files changed, 64 insertions(+), 47 deletions(-) delete mode 100644 kolourpaint-23.08.4.tar.xz delete mode 100644 kolourpaint-23.08.4.tar.xz.sig create mode 100644 kolourpaint-24.01.95.tar.xz create mode 100644 kolourpaint-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/kolourpaint-23.08.4.tar.xz b/kolourpaint-23.08.4.tar.xz deleted file mode 100644 index 9aa575f..0000000 --- a/kolourpaint-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c2b79aca4a690dc852074bfcb76a999f22d527e1ee30d47ef103e814b19f8e6 -size 5790208 diff --git a/kolourpaint-23.08.4.tar.xz.sig b/kolourpaint-23.08.4.tar.xz.sig deleted file mode 100644 index 54993ad..0000000 --- a/kolourpaint-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7sAACgkQu0YzUNbv -Me/IeRAAlYrcAeKsbr2ABVQDl0JUty8vOlyCXgB36brEwfN4o3Q4bJPMeXXe0eQd -SsltP1i9A3QdO3YekxMI1sn2ncPyoFiDblYyGgcRRNDsi0/L1jlBECUSciQq2+Zt -V7/NY2S9YJX5DyiB/ZPWxnp+LPJBjcuFiZ8r2nWuaU0zm5tB1eSjujQxAnlczedS -iTO2eYngL+W4XNoRUfOjhqWV5Olay8AHYRvrDOqrI1QSW7ZFxMbLV7XjXrqBDdxq -F/2yOStHKmU5fo+yR9wS+TmKNXAo+zOz6MkHuCq0gWOlq+LVuKFFGBVjaaf57pRK -9uXJBunELDprak9xNb4sSOkMDlBWRwRbpjZC82HSXL9YjJQaGBBNZL9LIHmkkGk2 -ih9Y4LnMsqW0pSo9oAweSInXhmQpZu99Ynx2lsoGVJDJyLrXWDXKP1pNv0SobUHP -mhwzNAKvdQ3JRN7LVKnd88IHivxgNv5/z3HCxXfne/sFZaFp21nUEqIOzWVZ8SF3 -Xma4+7J3ewST0yGgI62wkH8rU/rG2Ax+Yg+lAxobiOoU7vJnIMb+xn9CiWXk/kCS -rJvE6lFnmOz2PyWTaXYGbkA66mlSxE5fubcGzUs+Vk351ABbm4Buj9ZRt3lRWnC5 -72TFAMuBCW84DRoN0IH0XADN32JG8S3dopsi2wsJAaeRbBX/kDY= -=Sv0G ------END PGP SIGNATURE----- diff --git a/kolourpaint-24.01.95.tar.xz b/kolourpaint-24.01.95.tar.xz new file mode 100644 index 0000000..3bdff2f --- /dev/null +++ b/kolourpaint-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c962ba8a65ec00ac3aff7b6cc42c7160fbb0bd61091a975589a9e1d0c5904539 +size 5796008 diff --git a/kolourpaint-24.01.95.tar.xz.sig b/kolourpaint-24.01.95.tar.xz.sig new file mode 100644 index 0000000..0e7268c --- /dev/null +++ b/kolourpaint-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44bcACgkQOmpNuDnq +ptdO7Q//fDV0ZnfxpkjlP85ny0gCFnh5s6zejA071EAjEiKvxXbecOlL0ecoOh64 +pyQRBTBIzvq6MFrky7MT+yw4KLV93OwIjy0/Kr2EbeA7KzGLfARGLWN8C9bFiit/ +dj5VGJOnJx9zDw9ud1SeIiHZBc7+Dw77C2Pzo3X9sG6V3FhI9ilKf2XE/mbf+8vn +bUPhF3PA4YPLA/J248VGIEDjuaIJCR7ah4d9KcQY2SIWMccXX6jb8P1uzfcu6Saq +gLQzLHkFT0BViqkOt23a4rHf3QcFmkeKyn9+TiTxNxRNvDa/gpJDlivb0qqXh2nW +7k/Fdw0nOktRSZXw5y41VqOSIXPK/FHoxIXiranhAQtdW87cJiFM6NS8+OsB60fd +kh5F45B6QlOTmnq5RYH4+L+RSLTfeR4yXPvUEHz1KjKf0kknMMPBcwlsvHlQNCVp +vEsT6F2iN91uo2PkCZyo5MC0S3RnnCs9e0trLP3gNqtYK/ZYkrQB1/IfrCiWkfOP +uWRu2db3is0a2Rwxv2qYYHo3x/l5P+oKNvGhZCvFfC5WVwYfV6Y2AFuokekvJBt2 +lPLm4PgXvqG8S4FCwbwsXFrYLdEdcksTmLbfBE5HXkitAtoqw6c8yRTOxqLfMXmF +KG65CVx2y9vurdAucxgM9/vxbuUxsU5bhd2EcoparYUp/Oeoju0= +=USnA +-----END PGP SIGNATURE----- diff --git a/kolourpaint.changes b/kolourpaint.changes index b025854..c0b3c5c 100644 --- a/kolourpaint.changes +++ b/kolourpaint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:00 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:57 UTC 2023 - Christophe Marin diff --git a/kolourpaint.spec b/kolourpaint.spec index bac5ccf..e43193d 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -1,7 +1,7 @@ # # spec file for package kolourpaint # -# 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,29 +16,39 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kolourpaint -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Paint Program # See boo#717722 for license details # GPL-2.0 is the license of the Bulgarian translation -License: BSD-2-Clause AND LGPL-2.1-or-later AND GFDL-1.2-or-later AND GPL-2.0-only +License: LGPL-2.1-or-later AND GPL-2.0-only URL: https://apps.kde.org/kolourpaint -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: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes -BuildRequires: kf5-filesystem BuildRequires: update-desktop-files -BuildRequires: xz -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5Sane) -# boo#1055759 -Requires: kdelibs4support +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +# FIXME not ported or CMakeLists.txt error +# BuildRequires: cmake(KF5Sane) Provides: kolourpaint5 = %{version} Obsoletes: kolourpaint5 < %{version} @@ -51,32 +61,33 @@ Paint program by KDE %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} +%find_lang %{name} --with-html --all-name %suse_update_desktop_file org.kde.kolourpaint RasterGraphics -%fdupes -s %{buildroot}%{_datadir} + +%fdupes %{buildroot}%{_kf6_sharedir} %ldconfig_scriptlets %files -%license COPYING -%doc README* -%doc %lang(en) %{_kf5_htmldir}/en/*/ -%{_kf5_applicationsdir}/org.kde.kolourpaint.desktop -%{_kf5_appstreamdir}/org.kde.kolourpaint.appdata.xml -%{_kf5_bindir}/kolourpaint -%{_kf5_iconsdir}/hicolor/*/apps/kolourpaint.* -%{_kf5_kxmlguidir}/ -%{_kf5_libdir}/libkolourpaint_lgpl.so* -%{_kf5_sharedir}/kolourpaint/ +%license COPYING* +%doc README.md +%doc %lang(en) %{_kf6_htmldir}/en/*/ +%{_kf6_applicationsdir}/org.kde.kolourpaint.desktop +%{_kf6_appstreamdir}/org.kde.kolourpaint.appdata.xml +%{_kf6_bindir}/kolourpaint +%{_kf6_iconsdir}/hicolor/*/apps/kolourpaint.* +%{_kf6_libdir}/libkolourpaint_lgpl.so* +%{_kf6_sharedir}/kolourpaint/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/*/ %changelog