From fc2754f9bd216545b1352a61e8a032045e47b461 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 29 Mar 2024 19:08:45 +0100 Subject: [PATCH] automatic version update by autodist [release 24.02.1-1mamba;Mon Mar 25 2024] --- merkuro.spec | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/merkuro.spec b/merkuro.spec index 7f559e1..b837e4e 100644 --- a/merkuro.spec +++ b/merkuro.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: merkuro -Version: 23.08.5 +Version: 24.02.1 Release: 1mamba Summary: A Kirigami-based calendar and task management application that uses Akonadi Group: Graphical Desktop/Applications/Office @@ -9,7 +9,7 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://apps.kde.org/it/merkuro.calendar/ -Source: https://download.kde.org/stable/release-service/%{version}/src/merkuro-%{version}.tar.xz +Source: https://download.kde.org/%{stable_kde6}/release-service/%{version}/src/merkuro-%{version}.tar.xz License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -57,7 +57,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtquickcontrols2-devel ## AUTOBUILDREQ-END BuildRequires: cmake -BuildRequires: rpm-macros-kde5 +BuildRequires: kf6-rpm-macros BuildRequires: extra-cmake-modules %description @@ -69,38 +69,44 @@ A Kirigami-based calendar and task management application that uses Akonadi. %setup -q %build -%cmake_kde5 -d build -%make +%cmake_kf6 +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-man --with-html --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-man --with-html --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %{_bindir}/merkuro-calendar %{_bindir}/merkuro-contact %{_bindir}/merkuro-mail -%{_libdir}/qt5/qml/org/kde/akonadi/* -%dir %{_libdir}/qt5/qml/org/kde/merkuro -%{_libdir}/qt5/qml/org/kde/merkuro/* +%{_kf6_qmldir}/org/kde/akonadi/* +%dir %{_kf6_qmldir}/org/kde/merkuro +%{_kf6_qmldir}/org/kde/merkuro/* %{_datadir}/applications/org.kde.merkuro.*.desktop %{_datadir}/icons/hicolor/*/apps/org.kde.merkuro.*.png %{_datadir}/metainfo/org.kde.merkuro.*.metainfo.xml %{_datadir}/metainfo/org.kde.merkuro.contact.appdata.xml %dir %{_datadir}/plasma/plasmoids/org.kde.merkuro.contact %{_datadir}/plasma/plasmoids/org.kde.merkuro.contact/* -%{_datadir}/qlogging-categories5/akonadi.quick.categories -%{_datadir}/qlogging-categories5/merkuro.categories -%{_datadir}/qlogging-categories5/merkuro.contact.categories +%{_datadir}/qlogging-categories6/akonadi.quick.categories +%{_datadir}/qlogging-categories6/merkuro.categories +%{_datadir}/qlogging-categories6/merkuro.contact.categories %doc LICENSES %changelog +* Mon Mar 25 2024 Automatic Build System 24.02.1-1mamba +- automatic version update by autodist + +* Mon Mar 11 2024 Automatic Build System 24.02.0-1mamba +- automatic version update by autodist + * Sun Feb 18 2024 Automatic Build System 23.08.5-1mamba - automatic version update by autodist