diff --git a/.gitignore b/.gitignore index 49253af..f0a0d0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ /usbrelay-1.1.2.tar.gz /usbrelay-1.2.tar.gz -/usbrelay-1.2.1.tar.gz diff --git a/sources b/sources index 29f0ac8..9513647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbrelay-1.2.1.tar.gz) = a051201d3c34db9e59aae5e61011360a76fcd6e7dbc857540fc311ff93c8a0d90c51c11fe9e35273eebda0f179515ec7c455575d1bdf09c15af8be0c095459a2 +SHA512 (usbrelay-1.2.tar.gz) = 9bde33d2464f46ae5acd451d1606bc9f79c815fd54ac73d79e9e7a968dfcb82981759232f9705c50def331720c0a6384bf25c0fd9e6181ff6bb29615dce9e79f diff --git a/usbrelay-paho-mqttv2.patch b/usbrelay-paho-mqttv2.patch deleted file mode 100644 index c9dd774..0000000 --- a/usbrelay-paho-mqttv2.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 8094deb..6aad1c8 100644 --- a/usbrelay.spec +++ b/usbrelay.spec @@ -1,17 +1,20 @@ Name: usbrelay -Version: 1.2.1 +Version: 1.2 Release: %autorelease Summary: A library and command line tool to control USB-connected relays based on hidapi 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 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 @@ -138,6 +141,7 @@ groupadd --force --system usbrelay %{python3_sitearch}/%{name}_py*.dist-info %{python3_sitearch}/%{name} + %files mqtt %{_sbindir}/usbrelayd %{_unitdir}/usbrelayd.service @@ -149,7 +153,6 @@ groupadd --force --system usbrelay %files devel %{_includedir}/libusbrelay.h %{_libdir}/libusbrelay.so -%{_libdir}/pkgconfig/libusbrelay.pc %changelog