3.5.2

cairo-dock-plug-ins.spec

@@ -1,7 +1,7 @@
 %global	urlver		3.5
-%global	mainver		3.5.0
+%global	mainver		3.5.2
 
-%global	core_least_ver	3.5.0
+%global	core_least_ver	3.5.2
 
 #%%global	use_git	1
 %global	gitdate	20210730
@@ -9,7 +9,7 @@
 %global	shorthash	%(c=%{githash} ; echo ${c:0:7})
 
 %global	tarballver	%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
-%global	baserelease	2
+%global	baserelease	1
 
 
 %global	ruby_vendorlib	%(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
@@ -32,14 +32,9 @@ Source0:		cairo-dock-plugins-fedora-%{tarballver}.tar.gz
 Source1:		cairo-dock-plug-ins-create-fedora-tarball.sh
 # Port to WebKit2
 Patch11:		cairo-dock-plugins-3.4.1-port-WebKit2.patch
-# PEP632: switch from distutils to setuptools
-Patch12:		cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch
 # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version
 # Use webkit2gtk-4.1 for F-39+
 Patch13:		cairo-dock-plugins-3.4.1-port-WebKit2_gtk41.patch
-# https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/16
-# vala: move generated C source from vala source properly
-Patch14:		cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:	cmake
@@ -51,6 +46,7 @@ BuildRequires:	pkgconfig(gio-2.0)
 
 # Plug-ins
 BuildRequires:	pkgconfig(alsa)
+BuildRequires:	pkgconfig(ayatana-indicator3-0.4)
 BuildRequires:	pkgconfig(dbusmenu-glib-0.4)
 BuildRequires:	pkgconfig(dbusmenu-gtk3-0.4)
 BuildRequires:	pkgconfig(fftw3)
@@ -203,9 +199,7 @@ binding for Cairo-Dock.
 %prep
 %setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
 %patch -P11 -p1 -b .wk2
-%patch -P12 -p1 -b .pep632
 %patch -P13 -p1 -b .wk2_gtk41
-%patch -P14 -p1 -b .vala
 
 ## permission
 # %%_fixperms cannot fix permissions completely here
@@ -250,18 +244,7 @@ sed -i.py2 CMakeLists.txt -e 's|python2)|python2-nono)|'
 env LANG=C grep -rl /usr/bin/env . | \
 	xargs sed -i -e 's|/usr/bin/env[ \t]*python$|/usr/bin/python3|'
 
-# Quick-and-dirty workaround for libetpan 1.9.4 change using pkgconfig
-mkdir TMPBINDIR
-cat > TMPBINDIR/libetpan-config <<EOF
-#!/usr/bin/bash
-
-exec pkg-config \$@ libetpan
-EOF
-chmod 0755 TMPBINDIR/libetpan-config
-
 %build
-export PATH=${PATH}:$(pwd)/TMPBINDIR
-
 rm -f CMakeCache.txt
 %cmake -B. \
 %if 0%{?build_unstable} >= 1
@@ -418,6 +401,12 @@ popd
 %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h
 
 %changelog
+* Fri Mar 14 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.2-1
+- 3.5.2
+
+* Sun Sep 22 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.1-1
+- Update to 3.5.1
+
 * Fri Mar 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.0-2
 - vala: regenerate C source from vala source properly
   and reenable -Werror=incompatible-pointer-types

cairo-dock-plugins-3.4.1-python-pep632-distutils-port.patch

@@ -1,22 +0,0 @@
---- cairo-dock-plugins-gitf24f769/Dbus/interfaces/bash/setup.py.orig	2021-07-30 22:29:55.000000000 +0900
-+++ cairo-dock-plugins-gitf24f769/Dbus/interfaces/bash/setup.py	2023-01-03 18:54:57.725397471 +0900
-@@ -13,7 +13,7 @@
- # GNU General Public License for more details.
- # http://www.gnu.org/licenses/licenses.html#GPL
- 
--from distutils.core import setup
-+from setuptools import setup
- setup(name='CDBashApplet',
- 		version='1.0',
- 		license='GPL-3',
---- cairo-dock-plugins-gitf24f769/Dbus/interfaces/python/setup.py.orig	2021-07-30 22:29:55.000000000 +0900
-+++ cairo-dock-plugins-gitf24f769/Dbus/interfaces/python/setup.py	2023-01-03 18:55:05.840402277 +0900
-@@ -13,7 +13,7 @@
- # GNU General Public License for more details.
- # http://www.gnu.org/licenses/licenses.html#GPL
- 
--from distutils.core import setup
-+from setuptools import setup
- setup(name='CDApplet',
- 		version='1.0',
- 		license='GPL-3',

cairo-dock-plugins-pr16--vala-move-generated-C-source-from-vala-source-proper.patch

@@ -1,27 +0,0 @@
-From f771b2233d4c5157238b78b4d4e344815dd93ff4 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Fri, 8 Mar 2024 16:10:48 +0900
-Subject: [PATCH] vala: move generated C source from vala source properly
-
-valac generates C source from vala source and outputs the result
-on the same directory as vala source.
-But cmake working directory may be different
-from the vala source directory. So to move generated source properly,
-specify the origination directory for mv command explicitly.
----
- Dbus/interfaces/vala/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Dbus/interfaces/vala/CMakeLists.txt b/Dbus/interfaces/vala/CMakeLists.txt
-index d3047694e..f3d7d5fd2 100644
---- a/Dbus/interfaces/vala/CMakeLists.txt
-+++ b/Dbus/interfaces/vala/CMakeLists.txt
-@@ -26,7 +26,7 @@ if ("${VALAC_FOUND}" STREQUAL "TRUE")
- 		-o ${CDAPPLET}.c
- 		${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.vala)
- 	# it seems that valac can only produce the output c file into the current directory...
--	execute_process(COMMAND mv ${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c)
-+	execute_process(COMMAND mv ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c)
- 	
- 	# valac is a bad boy, it messes up the signal names.
- 	execute_process(COMMAND

sources

@@ -1 +1 @@
-SHA512 (cairo-dock-plugins-fedora-3.5.0.tar.gz) = 0346b9715151b62907214533570213db17f3c3b49fe2c0b1c76f62eb0a28a5942d0f22bf5d7c6c22a2d1f9b2d0178d1461984291ca5aefc57f3ae58606fca60c
+SHA512 (cairo-dock-plugins-fedora-3.5.2.tar.gz) = 330704304b6750a7affb0e341d1b874bcba8b82b633e70c710b46f8fa5766833aee6c854ea3b29136f3207bf92b1accd3c8427864eac3f92563ac6f650206914