From 3915f3f4e0e6e3803a24ca97f0dda5651e6c9837d84427f9d1390e9c7156ea61 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2024 20:08:12 +0000 Subject: [PATCH] KDE Gear 24.02 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdf?expand=0&rev=188 --- applications.keyring | Bin 6936 -> 5710 bytes desktop-files.diff | 9 ++-- kdf-23.08.4.tar.xz | 3 -- kdf-23.08.4.tar.xz.sig | 16 ------ kdf-24.01.95.tar.xz | 3 ++ kdf-24.01.95.tar.xz.sig | 16 ++++++ kdf.changes | 7 +++ kdf.spec | 115 +++++++++++++++++++++------------------- 8 files changed, 91 insertions(+), 78 deletions(-) delete mode 100644 kdf-23.08.4.tar.xz delete mode 100644 kdf-23.08.4.tar.xz.sig create mode 100644 kdf-24.01.95.tar.xz create mode 100644 kdf-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/desktop-files.diff b/desktop-files.diff index 3f0ab4c..a268c04 100644 --- a/desktop-files.diff +++ b/desktop-files.diff @@ -1,7 +1,10 @@ ---- desktop/org.kde.kwikdisk.desktop -+++ desktop/org.kde.kwikdisk.desktop -@@ -1,3 +1,4 @@ +diff --git a/desktop/org.kde.kwikdisk.desktop b/desktop/org.kde.kwikdisk.desktop +index 8365ff8..233a8a8 100755 +--- a/desktop/org.kde.kwikdisk.desktop ++++ b/desktop/org.kde.kwikdisk.desktop +@@ -1,4 +1,5 @@ [Desktop Entry] +OnlyShowIn=KDE; Name=KwikDisk Name[af]=Kwikdisk + Name[ar]=KwikDisk diff --git a/kdf-23.08.4.tar.xz b/kdf-23.08.4.tar.xz deleted file mode 100644 index 9e0d574..0000000 --- a/kdf-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1d16cce3125115d1b8902a708078ab672e414edf6db0ee31bc2c719a39c0c0d -size 495240 diff --git a/kdf-23.08.4.tar.xz.sig b/kdf-23.08.4.tar.xz.sig deleted file mode 100644 index f9bf497..0000000 --- a/kdf-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7ucACgkQu0YzUNbv -Me9ndw/+NIxsvuevCppBmj6gnzAec6wxQUJDjOdDMBj45Li2b0PJqqRtOe1s/KtO -PjPwUS5Poadmu4i8Xr1eFSnhkoNJKEwFR1HTwdb8MCIHbuC7gucFK8Ywdi2+Bz5y -IUTuVx/8c92PqdI+8565WRBTX7hfiCj7a1UOmlBF36g4PyrtW1Gr7yft984aq/Vw -Ju63BUZmsJ5844g/uC5TLrM0r3uTi50LE3CleVa5iHEskupBlaP2kq9g6KQt1WcO -U5ZT9jxG3JbbJ3O5AwxsWC0X5Xs7+QCipfzqPZDWC2YwLDGjjIRvRs59BNZTOrx8 -kSxUufBCfmM3MA4XKkaUDM5HEx9G8sYXpXDhpNNfHFp7Vsw++bJ7GS6drAJU647M -HZYCR6fyVSSOF6RWFUelvSoYeVuDz34g6of7oF8ARNBZQ1KCPgXtE1CwvmqY5QNx -DkBGMNsXSv9QNwz7SsXw2yBuZxhYB8a+ToRxfwqqe2QzACxfxNMxWEGqML9Sb9ex -GwpWsu3HHCFr4q/scN4caDVEdDqDk6CSjirlQZUMYXgPXDs6O28nbpSDYfAQqKPH -5BJVPwNdpzwcEzKgq6uez0hTBklo+r5CcCx/NwEjFCDuzDrPeJUBuhEdhknCD2UU -j835XVtwGqoah6xbQw6MbRU6HcTk11Z62NghpbM71mXgXYoWpLI= -=FQV4 ------END PGP SIGNATURE----- diff --git a/kdf-24.01.95.tar.xz b/kdf-24.01.95.tar.xz new file mode 100644 index 0000000..c7c516c --- /dev/null +++ b/kdf-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b6afdf9e89439416302e3d9afe77604185ef715a704e1f132c4316350ed0df0 +size 494260 diff --git a/kdf-24.01.95.tar.xz.sig b/kdf-24.01.95.tar.xz.sig new file mode 100644 index 0000000..077852a --- /dev/null +++ b/kdf-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44eUACgkQOmpNuDnq +ptejxhAAhapvoSWipvzoID4Gyqcbnx5cloWmFOXC1nayFRdVDurGX0bx9Ui27Jwz +FHiXegVUJ7xiVXBkYag7IXSGy1fmjEIBlGyxyMzidg2wDTcRDmztWPLtXHhMLh/n +8xCz9nW9wzQgC0Bs3oOPd6JK61SamupT8e8BliyHWeSb84VF1Lh4VV+YmF3KnlZy +fd5UNvNWOo2F3adjuHnk/NeB/jshYz2XMLCFCTj/zaENvcssVLESBD72YwZT/a4o +IbyQdT+24TF/w3gKc6NhtSKxkCYsY+mqHumyaIHU8Rf6dwn2aafQkc3KrC13YvEF +mRhP7zkXFK8VW0a+A+p82htXKx57FwVMNkQ2RQqpDSU9YqF04ifAC2LAWifwIVVv +uu/QrBlmPBxZqpd6N8SL3sTOysYIfhtlGm2xpjPxjNdUn4KURQo3SqQm3A/zBBWw +UyoWEHnINbL+W9co4jD84P+gNPJahL7Lm0zaJNBREIXTgUcj7Z6a6G5cpbGixK9O +7SIbz/8027w/Ef/TpWxrqTq0Ye5XYpdXOac3dCARz6YRWVoys7iyfREVunGcYlZg +58gevadBmSJ+Sw00bgShQNszfcn7Qo8DKEVSFhkdFn+nVmtkWKDru5ipZEZV3075 +hnVRQD4rk+OsrsLXbgE20E0FXUz0gk/W9tvkwouV9isrWazDUWo= +=XRoF +-----END PGP SIGNATURE----- diff --git a/kdf.changes b/kdf.changes index dcb281b..e1f232c 100644 --- a/kdf.changes +++ b/kdf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:15 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ +- Rebase desktop-files.diff + ------------------------------------------------------------------- Fri Dec 15 21:30:23 UTC 2023 - Christophe Marin diff --git a/kdf.spec b/kdf.spec index 2e6cc53..28f5af3 100644 --- a/kdf.spec +++ b/kdf.spec @@ -1,7 +1,7 @@ # # spec file for package kdf # -# 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,89 +16,92 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kdf -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Disk Usage Viewer License: GPL-2.0-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 -Patch1: desktop-files.diff -BuildRequires: extra-cmake-modules +Patch0: desktop-files.diff +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: update-desktop-files -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KCMUtils) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6StatusNotifierItem) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} %description KDE free disk space utility -%lang_package - -%prep -%autosetup -p0 -n kdf-%{version} - -%build -%cmake_kf5 -d build -%cmake_build - -%install -%kf5_makeinstall -C build - -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} - -%suse_update_desktop_file org.kde.kdf System Filesystem - %package -n kwikdisk Summary: Removable Media Utility %description -n kwikdisk This utility allows you to manage removable media. +%lang_package + +%prep +%autosetup -p1 + +%build +%cmake_kf6 + +%kf6_build + +%install +%kf6_install + +%find_lang %{name} --with-html --all-name + +%suse_update_desktop_file org.kde.kdf System Filesystem + %ldconfig_scriptlets %files %license LICENSES/* -%doc %lang(en) %{_kf5_htmldir}/en/kcontrol/blockdevices/ -%doc %lang(en) %{_kf5_htmldir}/en/kdf/ -%dir %{_kf5_htmldir}/en/kcontrol/ -%{_kf5_applicationsdir}/org.kde.kdf.desktop -%{_kf5_applicationsdir}/kcm_kdf.desktop -%{_kf5_appstreamdir}/org.kde.kdf.appdata.xml -%{_kf5_bindir}/kdf -%{_kf5_debugdir}/kdf.categories -%{_kf5_iconsdir}/hicolor/*/*/kcmdf.png -%{_kf5_iconsdir}/hicolor/*/*/kdf.png -%{_kf5_kxmlguidir}/kdf/ -%{_kf5_libdir}/libkdfprivate.so.* -%dir %{_kf5_plugindir}/plasma -%dir %{_kf5_plugindir}/plasma/kcms -%dir %{_kf5_plugindir}/plasma/kcms/systemsettings_qwidgets -%{_kf5_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_kdf.so +%dir %{_kf6_htmldir}/en/kcontrol/ +%doc %lang(en) %{_kf6_htmldir}/en/kcontrol/blockdevices/ +%doc %lang(en) %{_kf6_htmldir}/en/kdf/ +%{_kf6_applicationsdir}/org.kde.kdf.desktop +%{_kf6_applicationsdir}/kcm_kdf.desktop +%{_kf6_appstreamdir}/org.kde.kdf.appdata.xml +%{_kf6_bindir}/kdf +%{_kf6_debugdir}/kdf.categories +%{_kf6_iconsdir}/hicolor/*/*/kcmdf.png +%{_kf6_iconsdir}/hicolor/*/*/kdf.png +%{_kf6_libdir}/libkdfprivate.so.* +%{_kf6_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_kdf.so %files -n kwikdisk %license LICENSES/* -%{_kf5_applicationsdir}/org.kde.kwikdisk.desktop -%{_kf5_bindir}/kwikdisk -%{_kf5_iconsdir}/hicolor/*/*/kwikdisk.png +%{_kf6_applicationsdir}/org.kde.kwikdisk.desktop +%{_kf6_bindir}/kwikdisk +%{_kf6_iconsdir}/hicolor/*/*/kwikdisk.png %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kcontrol/blockdevices/ +%exclude %{_kf6_htmldir}/en/kdf/ %changelog