[packages/ka6-merkuro] - updated to 25.04.0

[witekfl]

commit 54119b73ed31ce81b1af847b7b953dadd3200ea6
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Thu Apr 17 21:26:35 2025 +0200

    - updated to 25.04.0

 ka6-merkuro.spec | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/ka6-merkuro.spec b/ka6-merkuro.spec
index b44583b..6e06d8c 100644
--- a/ka6-merkuro.spec
+++ b/ka6-merkuro.spec
@@ -2,19 +2,19 @@
 # Conditional build:
 %bcond_with	tests		# test suite
 
-%define		kdeappsver	24.12.3
+%define		kdeappsver	25.04.0
 %define		kframever	5.94.0
 %define		qtver		5.15.2
 %define		kaname		merkuro
 Summary:	Kalendar
 Summary(pl.UTF-8):	Kalendarz
 Name:		ka6-%{kaname}
-Version:	24.12.3
+Version:	25.04.0
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	ba11336205ee3eb2e84ac01cd7cdbf8e
+# Source0-md5:	983cf05d33613cb7217b602ec784b86d
 URL:		https://apps.kde.org/merkuro/
 BuildRequires:	Qt6Core-devel >= 5.15.2
 BuildRequires:	Qt6DBus-devel >= 5.15.2
@@ -128,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/qt6/qml/org/kde/akonadi
 %attr(755,root,root) %{_libdir}/qt6/qml/org/kde/akonadi/libakonadi_quick_plugin.so
 %{_libdir}/qt6/qml/org/kde/akonadi/AgentConfigurationForm.qml
+%{_libdir}/qt6/qml/org/kde/akonadi/CollectionChooserPage.qml
 %{_libdir}/qt6/qml/org/kde/akonadi/CollectionComboBox.qml
 %{_libdir}/qt6/qml/org/kde/akonadi/MobileCollectionComboBox.qml
 %{_libdir}/qt6/qml/org/kde/akonadi/ProgressStatusBar.qml
@@ -136,12 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/qt6/qml/org/kde/akonadi/kde-qmlmodule.version
 %{_libdir}/qt6/qml/org/kde/akonadi/qmldir
 %dir %{_libdir}/qt6/qml/org/kde/merkuro
-%dir %{_libdir}/qt6/qml/org/kde/merkuro/calendar
-%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/merkuro/calendar/libmerkuro_calendar_plugin.so
-%{_libdir}/qt6/qml/org/kde/merkuro/calendar/*.qml
-%{_libdir}/qt6/qml/org/kde/merkuro/calendar/kde-qmlmodule.version
-%{_libdir}/qt6/qml/org/kde/merkuro/calendar/merkuro_calendar_plugin.qmltypes
-%{_libdir}/qt6/qml/org/kde/merkuro/calendar/qmldir
 %dir %{_libdir}/qt6/qml/org/kde/merkuro/components
 %attr(755,root,root) %{_libdir}/qt6/qml/org/kde/merkuro/components/libMerkuroComponentsplugin.so
 %{_libdir}/qt6/qml/org/kde/merkuro/components/qmldir
@@ -151,11 +146,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/qt6/qml/org/kde/merkuro/contact
 %{_libdir}/qt6/qml/org/kde/merkuro/contact/private
 %{_libdir}/qt6/qml/org/kde/merkuro/contact/resources
-%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/merkuro/contact/libmerkuro_contact_plugin.so
 %{_libdir}/qt6/qml/org/kde/merkuro/contact/*.qml
 %{_libdir}/qt6/qml/org/kde/merkuro/contact/kde-qmlmodule.version
-%{_libdir}/qt6/qml/org/kde/merkuro/contact/merkuro_contact_plugin.qmltypes
 %{_libdir}/qt6/qml/org/kde/merkuro/contact/qmldir
+%{_libdir}/qt6/qml/org/kde/merkuro/contact/merkuro_contact.qmltypes
+%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/merkuro/contact/libmerkuro_contactplugin.so
 
 %files data -f %{kaname}.lang
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka6-merkuro.git/commitdiff/54119b73ed31ce81b1af847b7b953dadd3200ea6