diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kate-23.08.4.tar.xz b/kate-23.08.4.tar.xz deleted file mode 100644 index a7023bd..0000000 --- a/kate-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:297facaab205f67f2c61b17650ef27a10b32ea699083577eeece25d0beb3fba2 -size 8043840 diff --git a/kate-23.08.4.tar.xz.sig b/kate-23.08.4.tar.xz.sig deleted file mode 100644 index 97d7793..0000000 --- a/kate-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7dgACgkQu0YzUNbv -Me/7pBAAlvqVVOx8M07Jj/B7lpWz8mV2lYGqrvQIhSpDk59voOhPS9grRUmvjAAo -BFQy5cnyIPgchT+DVFhDpDC3uWAlllvlEBZQBouK6O7C4XqQUTzmMUWsM1zWsqmw -9nY5EFtNElnsW5K+PJKFmzUmbtBEqlbsAYHcxkDI2FSyZ9lMrjVid6X1jLq7rodJ -km0GvtbnCVe89uuUnsiJYSRgFDpKNrw5WswEN2VNB5U2K0+SgTS2TwjoHBg/CIoo -hEVlT3Hm5ocPxvBD+M4P2l/tL3652FiR+2lI9Gr9r1+pOckPyVLvR4ZTxCqeriS7 -zvQnGAtbkN1PBM3VE651MCtAy3sKOr8PM8lCbg0gsOYXl8f3BDLi37UXS8cWc+dS -PpB356zTprGh29WyzY4Z9AxnkQ2T+SMypYpA8K2rjh4O7UMBaHPk6pg55FBeaBNT -1xwmUHSLL8m/ICtMJGy6BT804GyaSotDViW1V2jEOhWLmKubV5phQKHkz6fHQ/Rg -PmT0+v5IoFIUgFR3qWnew/HHFo0XOPzWZOGA+PF8GzMhdXQwHO9HrnO9gOQnniRQ -gEV9tZqqkHtHfCZpSgt6omZahkbSaF7iBndHRtW2Sr1GopPFOvQ0hcQtnZLmcp3E -UigYr28B1Ok+kmRTG8oW4/WPOXeZzmOZzMYd0DboeoVA6BcmTbU= -=bpFY ------END PGP SIGNATURE----- diff --git a/kate-24.01.95.tar.xz b/kate-24.01.95.tar.xz new file mode 100644 index 0000000..1c39210 --- /dev/null +++ b/kate-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74d6dcc0b77c9f66645454c0f796d57f856fb8b51825299d9aa6cb8ea20697d6 +size 8393972 diff --git a/kate-24.01.95.tar.xz.sig b/kate-24.01.95.tar.xz.sig new file mode 100644 index 0000000..91764fc --- /dev/null +++ b/kate-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44LYACgkQOmpNuDnq +ptdOARAAqFd6dHaVuxGQROkTTPfselDgfmpyK0EW+40Dp+pauijBlWuoCmXyF10O +Su3bdkj1N1+DS8lfb/8PH0b63TOBnx8rVEPeXk9hMNH9PQipwn5ysrhuBxJPFECP +S9wEzipjGKwmH9B3WFLI2/WqOTM74ZgGUdEdVMat5zvmmHVYT5jZRPAboMMJnpwJ +mRNZqhaRkBlCcF/TKKS5C9iYO2NZNv1910a7P/uW6r96gm30hf3jbU/+iXcj+6NB +RyjXJOL3BZiDotCQWhZVB9x6hwDqogH936w2uCrjYkqaLx4kwvFtcEfgkSJeFGX0 +ogUEK+36KkigyLyZ50xGYGAG2a83r2MTT37zHZQmlBpLvMUuoE658tBd0PKRlgeg +TD0vilM6dbU7t19GaP7DjBbqZ1Zyh1yBeU2oM0VzDK0QEp+EY4XAeWyznwj8/R0h +tdlWa+zqV+H+CP8/FUdUxrxA5gRvnJflWm0JGvcbp8jMMGgyJE7oe6kzcHGDa9Sz +r2SxsnJzw5CERfB+SvOxJYdzDe2yb9Ul1tQ6JlQEHn6bLiU7tSz37wuQF5RQUWZ5 +i70OagB+5kcG3NRrQ0U2mrOs/0aiDcEbp+HK6ivJgjNg0evrCD00uV9JonCBXLUd +GhqfVlUvFmrlvg4QNEeGCczE2kwJMSqapU2+aWro24m8Q9Hx5xs= +=9bsx +-----END PGP SIGNATURE----- diff --git a/kate.changes b/kate.changes index 175ae2a..7dd938a 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:07:49 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Fri Dec 15 21:29:47 UTC 2023 - Christophe Marin diff --git a/kate.spec b/kate.spec index 054cf1d..11e34b3 100644 --- a/kate.spec +++ b/kate.spec @@ -1,7 +1,7 @@ # # spec file for package kate # -# 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,68 +16,55 @@ # -%define _appstreamkpackage 0%(cat %{_kf5_cmakedir}/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) +%define kf6_version 5.246.0 +%define plasma6_version 5.27.80 +%define qt6_version 6.6.0 + %bcond_without released Name: kate -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Advanced Text Editor License: GPL-3.0-or-later URL: https://kate-editor.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 # PATCH-FIX-OPENSUSE Patch0: 0001-Defuse-root-block.patch -BuildRequires: extra-cmake-modules -BuildRequires: libgit2-devel -BuildRequires: cmake(KF5Activities) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5Pty) -BuildRequires: cmake(KF5Service) -BuildRequires: cmake(KF5SyntaxHighlighting) -BuildRequires: cmake(KF5TextEditor) -BuildRequires: cmake(KF5ThreadWeaver) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KUserFeedback) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Script) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -%if 0%{?suse_version} <= 1500 -# is not available in GCC7 -BuildRequires: gcc10-c++ -BuildRequires: gcc10-PIE -%endif -Requires: %{name}-plugins = %{version} -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: qt6-gui-private-devel >= %{qt6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6NewStuff) >= %{kf6_version} +BuildRequires: cmake(KF6TextEditor) >= %{kf6_version} +BuildRequires: cmake(KF6UserFeedback) >= %{kf6_version} +BuildRequires: cmake(KF6Wallet) >= %{kf6_version} +BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} +BuildRequires: cmake(PlasmaActivities) >= %{plasma6_version} +BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Sql) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: kate-plugins = %{version} +Obsoletes: kate5 < %{version} +Provides: kate5 = %{version} %description Kate is an advanced text editor by KDE. %package -n kwrite Summary: KDE Text Editor -Requires: %{name}-plugins = %{version} +Requires: kate-plugins = %{version} Obsoletes: kwrite5 < %{version} %description -n kwrite @@ -99,60 +86,45 @@ plugins and data files for Kate and KWrite editors. %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 -%{kf5_find_htmldocs} +# Remove exotic icon sizes +rm -r %{buildroot}%{_kf6_iconsdir}/hicolor/{150x150,310x310,44x44} + +%find_lang %{name} --with-man --with-html --all-name %ldconfig_scriptlets %files -%doc README* -%dir %{_kf5_iconsdir}/hicolor/150x150/ -%dir %{_kf5_iconsdir}/hicolor/150x150/apps -%dir %{_kf5_iconsdir}/hicolor/310x310/ -%dir %{_kf5_iconsdir}/hicolor/310x310/apps -%dir %{_kf5_iconsdir}/hicolor/44x44/ -%dir %{_kf5_iconsdir}/hicolor/44x44/apps -%dir %{_kf5_iconsdir}/hicolor/256x256/ -%dir %{_kf5_iconsdir}/hicolor/256x256/apps -%dir %{_kf5_iconsdir}/hicolor/512x512/ -%dir %{_kf5_iconsdir}/hicolor/512x512/apps -%doc %lang(en) %{_kf5_htmldir}/en/kate/ -%doc %lang(en) %{_kf5_htmldir}/en/katepart/ -%doc %{_kf5_mandir}/man1/kate.* -%{_kf5_applicationsdir}/org.kde.kate.desktop -%{_kf5_appstreamdir}/org.kde.kate.appdata.xml -%{_kf5_bindir}/kate -%{_kf5_iconsdir}/hicolor/*/apps/kate.* -%{_kf5_libdir}/libkateprivate.so.* -%dir %{_kf5_sharedir}/kconf_update/ -%{_kf5_sharedir}/kconf_update/katesession_migration.upd -%{_kf5_sharedir}/kconf_update/migrate_kate_sessions_applet_to_kdeplasma-addons.sh +%doc README.md +%doc %lang(en) %{_kf6_htmldir}/en/kate/ +%doc %lang(en) %{_kf6_htmldir}/en/katepart/ +%doc %{_kf6_mandir}/man1/kate.1%{?ext_man} +%{_kf6_applicationsdir}/org.kde.kate.desktop +%{_kf6_appstreamdir}/org.kde.kate.appdata.xml +%{_kf6_bindir}/kate +%{_kf6_iconsdir}/hicolor/*/apps/kate.* +%{_kf6_libdir}/libkateprivate.so.* %files -n kwrite -%doc README* -%doc %lang(en) %{_kf5_htmldir}/en/kwrite/ -%{_kf5_applicationsdir}/org.kde.kwrite.desktop -%{_kf5_appstreamdir}/org.kde.kwrite.appdata.xml -%{_kf5_bindir}/kwrite -%{_kf5_iconsdir}/hicolor/*/apps/kwrite.* +%doc README.md +%{_kf6_applicationsdir}/org.kde.kwrite.desktop +%{_kf6_appstreamdir}/org.kde.kwrite.appdata.xml +%{_kf6_bindir}/kwrite +%{_kf6_iconsdir}/hicolor/*/apps/kwrite.* %files plugins -%license LICENSES/* -%doc README* -%{_kf5_plugindir}/ -%{_kf5_sharedir}/kateproject/ -%{_kf5_sharedir}/katexmltools/ +%{_kf6_plugindir}/kf6/ktexteditor/ +%{_kf6_sharedir}/kateproject/ +%{_kf6_sharedir}/katexmltools/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kate/ +%exclude %{_kf6_htmldir}/en/katepart/ %changelog