From 7542d0714bf131077e61b323f75e775b9f8377ce Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Sep 10 2023 16:39:20 +0000 Subject: Update to 3.5.2 (#2236129) Remove patches already applied upstream --- diff --git a/0001-Remove-references-to-ModbusSerialServer.start-1759-1.patch b/0001-Remove-references-to-ModbusSerialServer.start-1759-1.patch deleted file mode 100644 index 763be7e..0000000 --- a/0001-Remove-references-to-ModbusSerialServer.start-1759-1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 723aae99699cb60f4f38086b95e3089aa6b27a70 Mon Sep 17 00:00:00 2001 -From: Christian Krause -Date: Wed, 6 Sep 2023 07:54:22 +0200 -Subject: [PATCH] Remove references to ModbusSerialServer.start (#1759) (#1762) - ---- - pymodbus/server/reactive/main.py | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/pymodbus/server/reactive/main.py b/pymodbus/server/reactive/main.py -index 9ab6f4b8..409cb8ae 100644 ---- a/pymodbus/server/reactive/main.py -+++ b/pymodbus/server/reactive/main.py -@@ -237,18 +237,10 @@ class ReactiveServer: - """ - try: - if hasattr(asyncio, "create_task"): -- if isinstance(self._modbus_server, ModbusSerialServer): -- app["modbus_serial_server"] = asyncio.create_task( -- self._modbus_server.start() -- ) - app["modbus_server"] = asyncio.create_task( - self._modbus_server.serve_forever() - ) - else: -- if isinstance(self._modbus_server, ModbusSerialServer): -- app["modbus_serial_server"] = asyncio.ensure_future( -- self._modbus_server.start() -- ) - app["modbus_server"] = asyncio.ensure_future( - self._modbus_server.serve_forever() - ) --- -2.41.0 - diff --git a/pymodbus.spec b/pymodbus.spec index bba1fbd..b58cdbe 100644 --- a/pymodbus.spec +++ b/pymodbus.spec @@ -21,15 +21,13 @@ Server Features \ * A number of backing contexts (database, redis, a slave device) Name: pymodbus -Version: 3.5.0 +Version: 3.5.2 Release: 1%{?dist} Summary: %{sum} License: BSD-3-Clause URL: https://github.com/pymodbus-dev/pymodbus/ Source0: https://github.com/pymodbus-dev/pymodbus/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/pymodbus-dev/pymodbus/commit/723aae99699cb60f4f38086b95e3089aa6b27a70 -Patch0: 0001-Remove-references-to-ModbusSerialServer.start-1759-1.patch BuildArch: noarch BuildRequires: python3-devel @@ -83,6 +81,10 @@ rm -rf %{buildroot}%{python3_sitelib}/test %{_bindir}/pymodbus.simulator %changelog +* Sun Sep 10 2023 Christian Krause - 3.5.2-1 +- Update to 3.5.2 (#2236129) +- Remove patches already applied upstream + * Sun Sep 03 2023 Christian Krause - 3.5.0-1 - Update to 3.5.0 (#2236129) - Add upstreamed patch to fix a problem running pymodbus.server diff --git a/sources b/sources index c9af55f..e34c2b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pymodbus-3.5.0.tar.gz) = 8a24228d229cbc5b3d6d4080e4cf51ffee19387ca065d3e0bde047af85eb51b3b6560d965b630ff2a16b34157b2e71fbc87aee38f7bc6bc729e01ecc43a5a2a4 +SHA512 (pymodbus-3.5.2.tar.gz) = 94e9d03f19d94e5ae7ae50b81c5ddc1ef8c3efe95c2955b5f6e4a1085ff0a3becff6936b02e359a7db8f4a41f7b8776bfc798c587002c6a8a4c5898c07e920a9