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/kwordquiz-23.08.4.tar.xz b/kwordquiz-23.08.4.tar.xz deleted file mode 100644 index 68c8bc3..0000000 --- a/kwordquiz-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:405e2b6d1ca0be9e8d81b02422edd467e2870f0c8701c21f0f0a8165d4aadcbe -size 4073160 diff --git a/kwordquiz-23.08.4.tar.xz.sig b/kwordquiz-23.08.4.tar.xz.sig deleted file mode 100644 index 8c85669..0000000 --- a/kwordquiz-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7mwACgkQu0YzUNbv -Me9hQg//XoBYwnk8leBzINjhhnbw9lQFlFuZ4w2NmPTP0jkMieFsFjkPwpX3TgPr -/QfXSNQkADR19/DE5HSqdgYtAs1W7J27dN6vkGePFRhHoLdxuaUdl1SdYY7SGEMI -2iC0b2ZSehsFg4eNT3XMuLHkiqeleVW3O+Owd7SzVUyera6c8bFtyC1XbjL5h0Ai -cvGAf6G6o46kjSNVloOxEDUyL+N+MSm1WHrqjK4rWFSc6daNcPHnqT+8hO36JDlb -zapMXdP5Zh3MnDniaeKwZM+eDGkaLquBYjLzlPoGAt9Q/SHmjYxuarecQqPhZEUh -Tfpr9xuCc8HfHah18+zBZcaJipBoHpEkBvEGsiGdgcQkAEkYUeRIXSXghRg+o3NG -dWq0oAynBerEnRQI+ZhjWd7Sv5g2xFgCmV8rsrvfzW/wwjetAbHEPzA7jIkHB6SZ -MuJG03ODy4X0jjEnXETq6AmastC078gZFP4qVlv2xjGfUBsFIudMu3VNXLGy8zlN -zI4ALoINGa+GodHm1+zNZoQNbsrdDUIgLxx5FfCFga9QSo3ygxdjx3XcMpC6L2J5 -c40mZINztxuAGQXr4bdMtGfu4Wpyag8fkeRFMu61aErLavU2OBi9oMOFvf8gcmUd -HBMZ8xPdfoGYRRmYPFkaKzyWO0LODCm5ErA8E4JEIbw46utMrdw= -=jVqU ------END PGP SIGNATURE----- diff --git a/kwordquiz-24.02.0.tar.xz b/kwordquiz-24.02.0.tar.xz new file mode 100644 index 0000000..5cf2726 --- /dev/null +++ b/kwordquiz-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6cdcf0823a7701c6e1930d7d51a717a4ca5794781054d38cf278c66e0e02fa4 +size 4072936 diff --git a/kwordquiz-24.02.0.tar.xz.sig b/kwordquiz-24.02.0.tar.xz.sig new file mode 100644 index 0000000..c81725b --- /dev/null +++ b/kwordquiz-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVq5UACgkQu0YzUNbv +Me/K1w/+McTd2G3Pkf3aoP86dHKTkCr99T+DvSFlEO25FFrTQppX7jsBOMhGFjUF +i4j3an1Q/I6jY2/PBDWBU88FdkuQwQ8Ir7Z4BrUrOpuivSEqFhc4vY3Fjrg38NSf +20Xu8lPZjTdG3EgNTzYB2ENKrLdWU+7cREqBseGUu1koBmsNy3osV3QS0fpz/U/4 +QhxZTBHMpkOXI4cEf74dfz18ESjMnTFBa4ISWh7M2e81kemLG1Fr6mTF4R1mR2Rj +hB6Z5Liyltn6uBkq6dCdaJ958O0R7qYWgaWE0vJBZJCufTMHmVHy0PpiywMq7Ifq +adG3VkMl2puYfP2k97btX0UPyHiZvG6f0gr3ruqbL5QpArUGdknBEwW31xQ7kgWH +TUL5IGtcCS8fNmKCei+x6ig6Jk4c2Xy2hjcqxhS7Zzqm3BOkk8szJmzS/X9umOLm +akb++lvFmRWw5bT2bBxJjgepvLIlfGjzL6QA5IpyhUUtk0c4dL9u3hsByot/fuqA +CFC/6mUP418TM1loeL+vfVoK4oMt3LTJBeRuA1oVATLnzdE8CdvbS1AjzdlVIjaM +4/5CJtS6avuR2e+nDnI7FybgvbN16ZkcIzI61m7PtJdHzU00PJ49ORvzk1QD/0kW +HQISJhwTHuD1GKl+8178HplsPzEgpHp65OrUo2HBkdKgZ5XKnZA= +=Eb1M +-----END PGP SIGNATURE----- diff --git a/kwordquiz.changes b/kwordquiz.changes index 937613c..9bf7e12 100644 --- a/kwordquiz.changes +++ b/kwordquiz.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 23 14:00:30 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Fri Feb 9 16:09:38 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:21 UTC 2023 - Christophe Marin diff --git a/kwordquiz.spec b/kwordquiz.spec index ef6b200..8b70e05 100644 --- a/kwordquiz.spec +++ b/kwordquiz.spec @@ -1,7 +1,7 @@ # # spec file for package kwordquiz # -# 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,47 +16,45 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kwordquiz -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0-or-later URL: https://apps.kde.org/kwordquiz -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5Kirigami2) -BuildRequires: cmake(KF5KirigamiAddons) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} +BuildRequires: cmake(KF6KirigamiAddons) +BuildRequires: cmake(KF6NewStuff) >= %{kf6_version} BuildRequires: cmake(LibKEduVocDocument) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickControls2) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Xml) >= %{qt6_version} +Requires: kf6-kirigami-imports >= %{kf6_version} +Requires: kirigami-addons6 +Obsoletes: kwordquiz5 < %{version} +Provides: kwordquiz5 = %{version} %description A flashcard and vocabulary learning program. @@ -70,32 +68,32 @@ A flashcard and vocabulary learning program. %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%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 -%fdupes -s %{buildroot} +%fdupes %{buildroot} %files %license LICENSES/* %doc AUTHORS README -%doc %lang(en) %{_kf5_htmldir}/en/kwordquiz/ -%{_kf5_applicationsdir}/org.kde.kwordquiz.desktop -%{_kf5_appsdir}/kwordquiz/ -%{_kf5_appstreamdir}/org.kde.kwordquiz.appdata.xml -%{_kf5_bindir}/kwordquiz -%{_kf5_configkcfgdir}/ -%{_kf5_iconsdir}/hicolor/*/apps/kwordquiz.* -%{_kf5_iconsdir}/hicolor/*/apps/org.kde.kwordquiz.* -%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-kwordquiz.png -%{_kf5_knsrcfilesdir}/kwordquiz.knsrc -%{_kf5_sharedir}/knotifications5/ +%doc %lang(en) %{_kf6_htmldir}/en/kwordquiz/ +%{_kf6_applicationsdir}/org.kde.kwordquiz.desktop +%{_kf6_appstreamdir}/org.kde.kwordquiz.appdata.xml +%{_kf6_bindir}/kwordquiz +%{_kf6_configkcfgdir}/kwordquiz.kcfg +%{_kf6_iconsdir}/hicolor/*/apps/kwordquiz.* +%{_kf6_iconsdir}/hicolor/*/apps/org.kde.kwordquiz.* +%{_kf6_iconsdir}/hicolor/*/mimetypes/application-x-kwordquiz.png +%{_kf6_knsrcfilesdir}/kwordquiz.knsrc +%{_kf6_sharedir}/kwordquiz/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kwordquiz/ %changelog