[rpms/cairo-dock-plug-ins] nightly: merge

[Mamoru TASAKA <mtasaka@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/cairo-dock-plug-ins
Branch : nightly
Commit : a0dad10c6507e8da7bb25191b6cf46018423282c
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-07-19T16:15:16+09:00
Stats  : +27/-93 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/cairo-dock-plug-ins/c/a0dad10c6507e8da7bb25191b6cf46018423282c?branch=nightly

Log:
merge

---
diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index a75a952..c96d801 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -420,6 +420,9 @@ popd
 %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h
 
 %changelog
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Wed Jul 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.6.2-7
 - Backport upstream patch to support ical 4
 

diff --git a/cairo-dock-plug-ins-create-fedora-tarball.sh b/cairo-dock-plug-ins-create-fedora-tarball.sh
index 517ce56..5982c5e 100644
--- a/cairo-dock-plug-ins-create-fedora-tarball.sh
+++ b/cairo-dock-plug-ins-create-fedora-tarball.sh
@@ -5,7 +5,6 @@ set -x
 
 umask 0022
 
-VERSION=${VERSION:-3.5.0}
 VERSION_PARENT=${VERSION%.[0-9]}
 
 REPONAME=cairo-dock-plug-ins
@@ -32,6 +31,11 @@ if [ "x${USE_GIT}" != "x" ] ; then
 	GITDAME_B="$(date -d "${GITDATE}" '+%Y%m%d')"
 	GITHASH="$(git log | sed -n -e 's|^commit[ \t]||p')"
 	SHORTHASH=$(echo ${GITHASH:0:7})
+
+	if [ "x${VERSION}" = "x" ] ; then
+		VERSION=$(cat CMakeLists.txt | sed -n -e 's|^.*set.*(VERSION "||p' | sed -e 's|".*||')
+	fi
+
 	cd ..
 	cd ..
 
@@ -41,6 +45,11 @@ else
 	true
 fi
 
+VERSION=${VERSION:-3.5.0}
+if [ "x${GITTAR_VERSION}" = x ] ; then
+	GITTAR_VERSION=${VERSION}
+fi
+
 TARBALL_NAME=${TARNAME}-${FEDORA_TAR_VERSION}.tar.gz
 SOURCE_URL=${SOURCE_TOP_URL}/${GITTAR_VERSION}/${TARBALL_NAME}
 

diff --git a/cairo-dock-plug-ins-pr132-support-ical-4.patch b/cairo-dock-plug-ins-pr132-support-ical-4.patch
deleted file mode 100644
index c0cfaa5..0000000
--- a/cairo-dock-plug-ins-pr132-support-ical-4.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 077af5fd72b4aa42a77c750cef7e85a9ecf84b13 Mon Sep 17 00:00:00 2001
-From: Daniel Kondor <kondor.dani@gmail.com>
-Date: Sun, 5 Jul 2026 13:23:04 +0200
-Subject: [PATCH] clock: update to support newer ical version
-
----
- clock/src/applet-backend-ical.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/clock/src/applet-backend-ical.c b/clock/src/applet-backend-ical.c
-index 84c6ea05b..aff124fac 100644
---- a/clock/src/applet-backend-ical.c
-+++ b/clock/src/applet-backend-ical.c
-@@ -26,6 +26,7 @@
- #include "applet-calendar.h"
- 
- #ifdef CD_CLOCK_ICAL_SUPPORT
-+#include <libical/ical.h>
- #include <libical/icalfileset.h>
- #include <libical/icalset.h>
- #include <libical/icalcomponent.h>
-@@ -201,10 +202,15 @@ static GList *get_tasks (GldiModuleInstance *myApplet)
- 		pTask->iFrequency = CD_TASK_DONT_REPEAT;
- 		// TODO: really do the frequency management. If possible.
- 		icalproperty *rrule = NULL;
--		struct icalrecurrencetype recur;
- 		rrule = icalcomponent_get_first_property(piCalComponent,ICAL_RRULE_PROPERTY);
--		recur = icalproperty_get_rrule(rrule);
-+		
-+#if ICAL_CHECK_VERSION(4,0,0)
-+		struct icalrecurrencetype *recur = icalproperty_get_rrule(rrule);
-+		switch( recur->freq )
-+#else		
-+		struct icalrecurrencetype recur = icalproperty_get_rrule(rrule);
- 		switch( recur.freq )
-+#endif
- 		{
- 			case ICAL_MONTHLY_RECURRENCE:pTask->iFrequency = CD_TASK_EACH_MONTH; break;
- 			case ICAL_YEARLY_RECURRENCE:pTask->iFrequency = CD_TASK_EACH_YEAR; break;
-@@ -266,19 +272,31 @@ static gboolean create_task (CDClockTask *pTask, GldiModuleInstance *myApplet)
- 	icalcomponent_set_dtstart(piCalComponent, liCalStartDate);
- 	
- 	icalproperty *rrule = NULL;
--	struct icalrecurrencetype recur;
-+	const char *freq_str = NULL;
- 	switch( pTask->iFrequency )
- 	{
- 		case CD_TASK_EACH_MONTH:
--			recur = icalrecurrencetype_from_string("FREQ=MONTHLY");
--			rrule = icalproperty_new_rrule(recur);
-+			freq_str = "FREQ=MONTHLY";
- 			break;
- 		case CD_TASK_EACH_YEAR:
--			recur = icalrecurrencetype_from_string("FREQ=YEARLY");
--			rrule = icalproperty_new_rrule(recur);
-+			freq_str = "FREQ=YEARLY";
- 			break;
- 		default: break;
- 	}
-+
-+	if( freq_str )
-+	{
-+#if ICAL_CHECK_VERSION(4,0,0)
-+		struct icalrecurrencetype *recur = icalrecurrencetype_new_from_string(freq_str);
-+#else
-+		struct icalrecurrencetype recur = icalrecurrencetype_from_string(freq_str);
-+#endif
-+		rrule = icalproperty_new_rrule(recur);
-+#if ICAL_CHECK_VERSION(4,0,0)
-+		icalrecurrencetype_unref (recur);
-+#endif
-+	}
-+
- 	if( bIsModification == TRUE )
- 	{
- 		// we should remove the previous RECUR property

diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index 41202d6..c96d801 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -1,16 +1,16 @@
 %global	urlver		3.6
-%global	mainver		3.6.2
+%global	mainver		3.6.100
 
-%global	core_least_ver	3.6.0
+%global	core_least_ver	3.6.100
 
-%dnl %global	use_git	1
-%global	gitdate	20250922
-%global	githash	f45372c1fbce5dc9a34a991ff6e2485d39603279
+%global	use_git	1
+%global	gitdate	20260711
+%global	githash	0bcf72d670cccc11bc865ca7847673027313d365
 %global	shorthash	%(c=%{githash} ; echo ${c:0:7})
 
 %global	tarballver	%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
 
-%global	baserelease	8
+%global	baserelease	2
 %dnl %global	alphatag		.rc9
 
 %global	ruby_vendorlib	%(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
@@ -22,7 +22,7 @@
 
 ##########################################
 %global		flagrel	%{nil}
-%global		use_gcc_strict_sanitize	0
+%global		use_gcc_strict_sanitize	1
 
 %if	0%{?use_gcc_strict_sanitize} >= 1
 %global		flagrel	%{flagrel}.san
@@ -42,9 +42,6 @@ URL:			http://glx-dock.org/
 Source0:		cairo-dock-plugins-fedora-%{tarballver}.tar.gz
 # Source0 is created from Source1
 Source1:		cairo-dock-plug-ins-create-fedora-tarball.sh
-# https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/132/
-# Support ical 4
-Patch0:		cairo-dock-plug-ins-pr132-support-ical-4.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:	cmake
@@ -208,7 +205,6 @@ binding for Cairo-Dock.
 
 %prep
 %setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
-%patch -P0 -p1 -b .ical_4
 
 ## permission
 # %%_fixperms cannot fix permissions completely here
@@ -273,7 +269,9 @@ rm -f CMakeCache.txt
 	-Denable-disks=TRUE \
 	-Denable-doncky=TRUE \
 	-Denable-global-menu=TRUE \
+%if 0
 	-Denable-network-monitor=TRUE \
+%endif
 	-Denable-weblets=TRUE \
 %if 0
 	-Denable-scooby-do=TRUE \
@@ -357,12 +355,12 @@ popd
 %exclude	%{_libdir}/cairo-dock/libcd-Global-Menu.so
 %exclude	%{_libdir}/cairo-dock/libcd-disks.so
 %exclude	%{_libdir}/cairo-dock/libcd-doncky.so
-%exclude	%{_libdir}/cairo-dock/libcd-network-monitor.so
+%dnl %exclude	%{_libdir}/cairo-dock/libcd-network-monitor.so
 #%%exclude	%%{_libdir}/cairo-dock/libcd-scooby-do.so
 %exclude	%{_datadir}/cairo-dock/plug-ins/Disks/
 %exclude	%{_datadir}/cairo-dock/plug-ins/Doncky/
 %exclude	%{_datadir}/cairo-dock/plug-ins/Global-Menu/
-%exclude	%{_datadir}/cairo-dock/plug-ins/Network-Monitor/
+%dnl %exclude	%{_datadir}/cairo-dock/plug-ins/Network-Monitor/
 #%%exclude	%%{_datadir}/cairo-dock/plug-ins/Scooby-Do/
 %endif
 # Vala
@@ -374,12 +372,12 @@ popd
 %{_libdir}/cairo-dock/libcd-Global-Menu.so
 %{_libdir}/cairo-dock/libcd-disks.so
 %{_libdir}/cairo-dock/libcd-doncky.so
-%{_libdir}/cairo-dock/libcd-network-monitor.so
+%dnl %{_libdir}/cairo-dock/libcd-network-monitor.so
 #%%{_libdir}/cairo-dock/libcd-scooby-do.so
 %{_datadir}/cairo-dock/plug-ins/Disks/
 %{_datadir}/cairo-dock/plug-ins/Doncky/
 %{_datadir}/cairo-dock/plug-ins/Global-Menu/
-%{_datadir}/cairo-dock/plug-ins/Network-Monitor/
+%dnl %{_datadir}/cairo-dock/plug-ins/Network-Monitor/
 #%%{_datadir}/cairo-dock/plug-ins/Scooby-Do/
 %endif
 

diff --git a/sources b/sources
index bd0de08..2562cca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cairo-dock-plugins-fedora-3.6.2.tar.gz) = e8463af3efff540d953fd324a3a24840b355de7b0bf8c70478fc557d2a6469aab4241100096817721aa3136e305362d80e344a6ebd5f6107d70b93a9f4c5f9b4
+SHA512 (cairo-dock-plugins-fedora-3.6.100-20260711git0bcf72d.tar.gz) = fa8e3409bd9d2869780a04bdcf91bafc63dfb804c19e7e82cd03ac219bbd54e050954433f895009bc92b1b45eab464e5df781019a28c38614979cc1bc17f4852