From 9693290980e106a4b3ca17eb966cd2f651198e55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:18:16 +0000 Subject: [PATCH 01/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b5d1edefdc54d21c957c885471b7afd150aef8f5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 10:33:28 +0200 Subject: [PATCH 02/14] Rebuilt for Python 3.13 From 418d0a93f4b05b85603c143d4c9e115c423de214 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:25:45 +0000 Subject: [PATCH 03/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0cf1fa2d6918f055e3b1560988ff0628cd51635c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 1 Nov 2024 15:31:33 +0100 Subject: [PATCH 04/14] Drop duplicate manually listed BuildRequires The fact that %tox uses python3-tox-current-env is an internal implementation detail. The fact that %pyproject_wheel uses python3-pip is an internal implementation detail. The fact that setuptools uses wheel will change in setuptools 74+. --- usbrelay.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/usbrelay.spec b/usbrelay.spec index 4c9046d..4710ced 100644 --- a/usbrelay.spec +++ b/usbrelay.spec @@ -9,12 +9,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: hidapi-devel BuildRequires: make -BuildRequires: python3 BuildRequires: python3-devel -BuildRequires: python3-pip -BuildRequires: python3-toml -BuildRequires: python3-wheel -BuildRequires: python3-tox-current-env BuildRequires: systemd-rpm-macros Requires: systemd-udev From e76d2a94c827230484e2430f319f801aa903fec1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Nov 2024 12:29:34 +0000 Subject: [PATCH 05/14] Upstream patch to support Paho MQTT v2 --- usbrelay-paho-mqttv2.patch | 28 ++++++++++++++++++++++++++++ usbrelay.spec | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 usbrelay-paho-mqttv2.patch diff --git a/usbrelay-paho-mqttv2.patch b/usbrelay-paho-mqttv2.patch new file mode 100644 index 0000000..c9dd774 --- /dev/null +++ b/usbrelay-paho-mqttv2.patch @@ -0,0 +1,28 @@ +From 58fed08a2a1b10122360845c780c9fa17cf9d6b3 Mon Sep 17 00:00:00 2001 +From: Michal Sojka +Date: Tue, 30 Apr 2024 14:03:40 +0200 +Subject: [PATCH] usbrelayd: Add support for paho-mqtt >= 2.0.0 + +See https://eclipse.dev/paho/files/paho.mqtt.python/html/migrations.html#change-between-version-1-x-and-2-0 +--- + usbrelayd | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/usbrelayd b/usbrelayd +index 60c13dc..10bfe1e 100644 +--- a/usbrelayd ++++ b/usbrelayd +@@ -95,7 +95,12 @@ else: + # connect to the mqtt broker + + +-client = mqtt.Client(clientName) ++if "CallbackAPIVersion" in dir(mqtt): ++ # paho-mqtt >= 2.0.0 ++ client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, clientName) ++else: ++ # paho-mqtt < 2.0.0 ++ client = mqtt.Client(clientName) + client.connect(mqttBroker) + publish_states(client) + client.on_message=on_message diff --git a/usbrelay.spec b/usbrelay.spec index 4710ced..8094deb 100644 --- a/usbrelay.spec +++ b/usbrelay.spec @@ -5,6 +5,8 @@ Summary: A library and command line tool to control USB-connected relays License: GPL-2.0-or-later URL: https://github.com/darrylb123/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/darrylb123/usbrelay/pull/112 +Patch1: usbrelay-paho-mqttv2.patch BuildRequires: gcc BuildRequires: hidapi-devel @@ -136,7 +138,6 @@ groupadd --force --system usbrelay %{python3_sitearch}/%{name}_py*.dist-info %{python3_sitearch}/%{name} - %files mqtt %{_sbindir}/usbrelayd %{_unitdir}/usbrelayd.service From 7f4722481c6d82c77d2ec0eddeb7c567ac392ba2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:57:01 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 648f31df87f5c20570ddba3fc01fe12fc4c072cd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 21:24:22 +0200 Subject: [PATCH 07/14] Rebuilt for Python 3.14 From dc49095536b877017bb04b9ce57576d2438a4a82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:52:53 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 25f71a283e2336b484ab0f000e8c7996d07efb56 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:41 +0200 Subject: [PATCH 09/14] Rebuilt for Python 3.14.0rc2 bytecode From 7d91386376d3724bf3e5b9761cdf03213c1bf7dd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:43 +0200 Subject: [PATCH 10/14] Rebuilt for Python 3.14.0rc3 bytecode From 58b248a39d77886c12173afeb1f1cb4181418631 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:42:03 +0000 Subject: [PATCH 11/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From cc8b85f4361ff59e7b71799c059578edac834724 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 22:49:48 +0200 Subject: [PATCH 12/14] Rebuilt for Python 3.15 From f8d7b55b168cd1a127bf7fefbc9d1fa9c6464694 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:16:39 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From dcb51d450f96a6ef45baf209de9536597a8aa27f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:20:13 +0200 Subject: [PATCH 14/14] Rebuilt for Python 3.15.0b4 ABI change