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

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

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/cairo-dock-plug-ins
Branch : nightly
Commit : 2628a08564e8e8a024f835a0f096b4e9a2ff9a95
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-06-21T22:39:38+09:00
Stats  : +34/-15 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/cairo-dock-plug-ins/c/2628a08564e8e8a024f835a0f096b4e9a2ff9a95?branch=nightly

Log:
merge

---
diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index 8567b6a..ea81be1 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -10,7 +10,7 @@
 
 %global	tarballver	%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
 
-%global	baserelease	1
+%global	baserelease	2
 %dnl %global	alphatag		.rc9
 
 %global	ruby_vendorlib	%(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
@@ -67,7 +67,6 @@ BuildRequires:	pkgconfig(libgnomeui-2.0)
 BuildRequires:	pkgconfig(libical)
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(libxklavier)
-BuildRequires:	pkgconfig(openssl) >= 1.1
 # BuildRequires:	pkgconfig(thunar-vfs-1)
 BuildRequires:	pkgconfig(upower-glib)
 BuildRequires:	pkgconfig(vte-2.91)
@@ -421,6 +420,15 @@ popd
 %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h
 
 %changelog
+* Sat Jun 20 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.6.2-6
+- Remove unneeded BR: openssl-devel
+
+* Fri Jun 19 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.6.2-5
+- Rebuild for new libetpan
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 3.6.2-4
+- Rebuilt for openssl 4.0
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

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.spec b/cairo-dock-plug-ins.spec
index 5dcf38a..ea81be1 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.99
 
-%global	core_least_ver	3.6.0
+%global	core_least_ver	3.6.99
 
-%dnl %global	use_git	1
-%global	gitdate	20250922
-%global	githash	f45372c1fbce5dc9a34a991ff6e2485d39603279
+%global	use_git	1
+%global	gitdate	20260514
+%global	githash	77abb5eb6b68d59571a690b11d9cf1609c36d023
 %global	shorthash	%(c=%{githash} ; echo ${c:0:7})
 
 %global	tarballver	%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
 
-%global	baserelease	6
+%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
@@ -269,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 \
@@ -353,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
@@ -370,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..e9f626e 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.99-20260514git77abb5e.tar.gz) = 8fea5039277e299aee99d9d43bba256d62f53972b3db1fd6de2644b9b242236d1f3f1f8030ee0cd41d44dd8654bb262cefb54511b595c7d34a1c6266be3ea088