rpm/merkuro
SHA256
1
0
Fork 0
forked from pool/merkuro
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory
rpm:devel
pool:factory
pool:devel
...
pull from: pool:factory
Branches Tags
pool:factory
pool:devel
rpm:factory
rpm:devel

15 Commits
factory ... factory

Author SHA256 Message Date
Ana Guerrero
103573e6c4 Accepting request 1236591 from KDE:Applications 
KDE release gear 24.12.1 (forwarded request 1235746 from krop)

OBS-URL: https://build.opensuse.org/request/show/1236591
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=19
 2025-01-12 10:18:39 +00:00
Christophe Marin
944e9394c7 KDE release gear 24.12.1 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=47
 2025-01-09 16:44:08 +00:00
Ana Guerrero
f0275dba88 Accepting request 1231952 from KDE:Applications 
- Update runtime requirements

OBS-URL: https://build.opensuse.org/request/show/1231952
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=18
 2024-12-19 20:40:25 +00:00
Christophe Marin
7256963585 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=45 2024-12-18 18:32:35 +00:00
Christophe Marin
f87a7400de OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=44 2024-12-18 15:34:25 +00:00
Christophe Marin
699a1911ec OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=43 2024-12-18 15:32:49 +00:00
Christophe Marin
3234b4745a OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=42 2024-12-18 15:26:40 +00:00
Ana Guerrero
71427e9d5c Accepting request 1230537 from KDE:Applications 
KDE release gear 24.12.0 (forwarded request 1230034 from krop)

OBS-URL: https://build.opensuse.org/request/show/1230537
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=17
 2024-12-13 21:37:08 +00:00
Christophe Marin
5dffad8583 KDE release gear 24.12.0 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=40
 2024-12-12 10:47:01 +00:00
Christophe Marin
56255e0a67 KDE Release gear 24.12 rc 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=39
 2024-12-02 09:14:03 +00:00
Christophe Marin
33fdd4feb3 KDE release gear 24.12 beta 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=38
 2024-11-21 08:27:17 +00:00
Ana Guerrero
46538c664a Accepting request 1222413 from KDE:Applications 
KDE Release gear 24.08.3 (forwarded request 1221581 from krop)

OBS-URL: https://build.opensuse.org/request/show/1222413
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=16
 2024-11-08 10:59:05 +00:00
Christophe Marin
e21997a3ef KDE Release gear 24.08.3 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=36
 2024-11-07 12:53:34 +00:00
Dominique Leuenberger
6b4ffa79c5 Accepting request 1206981 from KDE:Applications 
KDE Release gear 24.08.2

OBS-URL: https://build.opensuse.org/request/show/1206981
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=15
 2024-10-12 11:29:40 +00:00
Christophe Marin
be047bc5cc KDE Release Gear 24.08.2 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=34
 2024-10-10 20:13:26 +00:00
6 changed files with 117 additions and 24 deletions
Show Stats Expand all files Collapse all files

3
merkuro-24.08.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87e7135ddd54cd7aced9ec5fc593c5e283c5c2c47a82417633688637bf3206a5
size 765716

16
merkuro-24.08.1.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmbf/N4ACgkQu0YzUNbv
Me+sPA/+Pz/x00hyJWlY1qbsQdAUeYVSzCk3bHlc9IPE3bVBb6Kjdj9RJ7DcBie5
sPczBGBvk7QcEh0slGax6URdKz/GN4aUyJT3bJ5OFCrDiMXYwoFe9i3UAVz7CQtB
rEg3Ue2ecjDkyV2geUxe1iiW9+fLzGK8VizsVTwD3Xp0bOAIgZu1YUZ9rOfXifB5
QqLou9Ar7B5ixSXFPTlRzOQI0nVPCZSbqMbiDpxTJLmUdT9g+FwxfFNS3bgQGoZZ
yQ9zwbgU+hXOEA7GGPqN/srRUPMTMrCClvrU0y4srQKNvYs5c0J2Ucph+sURUy5z
J9dXaONAlqAYsRlRzdFibV33VVRRSiyMK3bUAaVWSYhwiIlY6srx3Fni+PKTcgWy
0DtNa9JMqn3udeCsG/OBSFMGH+vT7MEYvkmSqiQ5P4LFJKBR/lgTu7WwIdZyXuCV
QsN0c9q0jw2bElyLObOQsnzKNeS5ztdfNh3V0/V8Ztzg+8Po4QdHUbkrGvvgfuwz
JYWFRpn+O1AlStG46zx03byTIRT8fyx1qNOL2eAubXcZ6TlrekL3UguEOQg4cJ8C
ZYnikK1MCXss9+huGFDN9040zqRDlccEEJJtU4C4yelRDUphqEUHZ02BfEkI7hP6
q1byPR7czdS0dQtbd8OJ5Tn75/o4niJwKQEz9WnQh+MdS+7QXgQ=
=81th
-----END PGP SIGNATURE-----

3
merkuro-24.12.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9529ef9f24f04e717e6a89d1d57838a8f8155a4a1492cd47338336d02c714da3
size 793160

16
merkuro-24.12.1.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmd80vIACgkQu0YzUNbv
Me+8kg/+N/7RpbW8rZejozRVVbKWXYG7Vb2o/vumYG1cO30oPXFmO/m28ScVsdTq
XM2OLuHhBQ+SusCo5cagAwQoYbkM+di/3UVLnRE5Tn1us+cy7dy1fb6vE/krUnqn
yg5Sz8d+IFMDlxE0RizDxS8LueWq3hKM6xL7GLiYDHOgC6cIjwTLAs+eO6gQH2GH
gXNW49/jxpBFty0JRDe3Mj1Me4WkWkLp08bbtVdfHq6w08Rb7n9OAVlnWUfHMAlX
ADThVfcSip0XvrNlY3UcH28mpfJEgDEvva/aFeTsyM+yLhflEw6pIfxxahm8Q5t4
/6xtL0J/3a/RehGoNd0SjdYWAprnGvf2gYlOH4hi0qJWSKr6lB1gOX+iS4kYLLsz
bRqDlzjleJ+6c7pxgZKVYEhx5ic7k8cgCaHtHLjD+WQ0Edp501O+I2VJWG0/Qe2f
TUZaZME1Jl0Dan56btjg5yZMOYGaXZrS0YfkY6//Tk9aVjA0bbaDjRoKSWHI6x+5
znOvyQvh1Yr0FqEUlZYa2tUMy/RyzL3L6tCa1wbFFGjgBHsJbG26T6bV+unwguhT
TWZ5ndm6xFuI3MSdfqRgk8BuEU3xkyCnV6xGqZwJMrOFilxRrfvPE82B9N356SLq
tobJpFlkKHaahPMj3Hb7Wsw75uXrjajNSwy/he+KDCOT8tfVLDo=
=Pkyk
-----END PGP SIGNATURE-----

83
merkuro.changes
View File

@ -1,3 +1,86 @@
-------------------------------------------------------------------
Tue Jan 7 18:53:55 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 24.12.1
* New bugfix release
* For more details please see:
* https://kde.org/announcements/gear/24.12.1/
- No code change since 24.12.0
-------------------------------------------------------------------
Wed Dec 18 15:26:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update runtime requirements
-------------------------------------------------------------------
Sun Dec 8 09:28:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.12.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/24.12.0/
- No code change since 24.11.90
-------------------------------------------------------------------
Mon Dec 2 08:43:58 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.11.90
* New feature release
- Too many changes since 24.11.80, only listing bugfixes:
* Install merkuro_contact_plugin shared library (kde#496347)
-------------------------------------------------------------------
Sat Nov 16 17:30:39 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.11.80
* New feature release
- Too many changes since 24.08.3, only listing bugfixes:
* Compile contacts plugin metadata in the actual QML plugin, not in the shared library. (kde#491808)
-------------------------------------------------------------------
Tue Nov 5 10:44:12 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.08.3
* New bugfix release
* For more details please see:
* https://kde.org/announcements/gear/24.08.3/
- Changes since 24.08.2:
* Fix adding new incidence in day grid view
* Fix use of DayMouseArea (now DayTapHandler) in hourly view-based views
* Center alignment of text on incidence-less month list day entries
* Match top and bottom margins for month list incidence items
* Rename DayMouseArea to DayTapHandler
* Fix double opening of incidence add window when double-clicking day grid view square
* Replace DayMouseArea as key delegate in BasicMonthListView with background rectangle
* Fix uses of DayMouseArea in BasicMonthListView
* Convert DayMouseArea into a TapHandler
* Fix tag and name filtering incidences in calendar views
* Fix references to non-existent openNewSubTodoEditorDialog
* Once collection combo box model starts receiving collections, set a valid default collection by default
* Re-enable geolocation components in the incidence editor page
* Reenable use of map in incidence info contents
* Fix import of Calendar in LocationMap
* Adapt LocationMap to Qt6
* Fix broken Calendar references in task completion slider onMoved handler
* Fix incidence info popup positioning
* Add missing window parameter to onCreateNew... handlers in calendar main
* Fix error in incidenceinfodrawer in main caused by null currentItem in pageStack
* Fix workaround for incidence info drawer getting cut off when menu bar loaded
* Fix alignment of incidence info drawer header text
* Fix references to removed CalendarUiUtils.setUpAdd function
* Rename InfiniteCalendarViewModel to InfiniteMerkuroCalendarViewModel
* Fix showing/hiding of hamburger menu in Calendar main drawer
* Fix contact config
-------------------------------------------------------------------
Tue Oct 8 12:02:27 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.08.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/gear/24.08.2/
- No code change since 24.08.1
-------------------------------------------------------------------
Tue Sep 10 14:11:40 UTC 2024 - Christophe Marin <christophe@krop.fr>

20
merkuro.spec
View File

@ -18,14 +18,14 @@
%global __requires_exclude qt6qmlimport\\((org\\.kde\\.merkuro|org\\.kde\\.raven).*
%define kf6_version 6.3.0
%define kf6_version 6.6.0
%define qt6_version 6.6.0
%define kpim6_version 6.2.1
%define plasma6_version 5.27.80
%define kpim6_version 6.3.1
%define plasma6_version 6.2.0
%bcond_without released
Name: merkuro
Version: 24.08.1
Version: 24.12.1
Release: 0
Summary: Calendar Application
License: GPL-3.0-only
@ -66,6 +66,7 @@ BuildRequires: cmake(Plasma) >= %{plasma6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6DBus) >= %{qt6_version}
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(Qt6Location) >= %{qt6_version}
BuildRequires: cmake(Qt6Qml) >= %{qt6_version}
BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version}
BuildRequires: cmake(Qt6QuickTest) >= %{qt6_version}
@ -76,9 +77,17 @@ Requires: kalendarac
Requires: kdepim-addons
Requires: kdepim-runtime
# No automatic qmlimport requires for embedded resources :-/
Requires: kf6-kdeclarative-imports >= %{kf6_version}
Requires: kf6-kirigami-imports >= %{kf6_version}
Requires: kf6-kitemmodels-imports >= %{kf6_version}
Requires: kf6-ksvg-imports >= %{kf6_version}
Requires: kidentitymanagement-imports
Requires: libPlasma6 >= %{plasma6_version}
Requires: libplasma6-components >= %{plasma6_version}
Requires: mimetreeparser-imports
Requires: qt6-declarative-imports >= %{qt6_version}
Requires: qt6-location >= %{qt6_version}
Requires: qt6-positioning-imports >= %{qt6_version}
Provides: kalendar = %{version}
Obsoletes: kalendar < %{version}
# merkuro has a runtime dependency on QtWebEngine
@ -89,8 +98,8 @@ Calendar application using Akonadi to sync with external services (NextCloud, GM
%package plasmoid
Summary: Plasma widget to view address book contacts
Supplements: (merkuro and plasma6-workspace)
Requires: merkuro = %{version}
Supplements: (merkuro and plasma6-workspace)
Provides: kalendar-plasmoid = %{version}
Obsoletes: kalendar-plasmoid < %{version}
@ -119,6 +128,7 @@ This package provides a Plasma widget to view address book contacts.
%{_kf6_applicationsdir}/org.kde.merkuro.calendar.desktop
%{_kf6_applicationsdir}/org.kde.merkuro.contact.desktop
%{_kf6_applicationsdir}/org.kde.merkuro.mail.desktop
%{_kf6_applicationsdir}/org.kde.merkuro.desktop
%{_kf6_appstreamdir}/org.kde.merkuro.calendar.metainfo.xml
%{_kf6_appstreamdir}/org.kde.merkuro.contact.metainfo.xml
%{_kf6_appstreamdir}/org.kde.merkuro.mail.metainfo.xml