diff --git a/pymodbus-2.2.0-correct-deps.patch b/pymodbus-2.2.0-correct-deps.patch new file mode 100644 index 0000000..1ecb01f --- /dev/null +++ b/pymodbus-2.2.0-correct-deps.patch @@ -0,0 +1,9 @@ +diff -uNr pymodbus-2.2.0.old/requirements.txt pymodbus-2.2.0/requirements.txt +--- pymodbus-2.2.0.old/requirements.txt 2019-04-18 10:46:52.000000000 +0200 ++++ pymodbus-2.2.0/requirements.txt 2019-06-23 11:00:32.727902663 +0200 +@@ -1,4 +1,4 @@ +-six==1.11.0 ++six>=1.11.0 + # ------------------------------------------------------------------- + # if want to use the pymodbus serial stack, uncomment these + # ------------------------------------------------------------------- diff --git a/pymodbus.spec b/pymodbus.spec index 8db01c3..e3ad3c3 100644 --- a/pymodbus.spec +++ b/pymodbus.spec @@ -22,7 +22,7 @@ Server Features \ Name: pymodbus Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD @@ -30,6 +30,9 @@ URL: https://github.com/riptideio/pymodbus Source0: https://github.com/riptideio/pymodbus/archive/v%{version}.tar.gz # to avoid packaging ez_setup Patch0: pymodbus-1.4.0-remove-ez_setup.patch +# do not require a fixed version of python-six +# https://github.com/riptideio/pymodbus/issues/384#issuecomment-487808056 +Patch1: pymodbus-2.2.0-correct-deps.patch BuildArch: noarch BuildRequires: python3-devel @@ -56,6 +59,7 @@ Recommends: python3-click %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .no_ez_setup +%patch1 -p1 -b .correct-deps %build %py3_build @@ -80,6 +84,10 @@ Recommends: python3-click %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/ %changelog +* Sun Jun 23 2019 Christian Krause - 2.2.0-2 +- Fix dependency issue (package can't be installed since a fixed + version of python-six was required) + * Fri May 10 2019 Christian Krause - 2.2.0-1 - Updated to the latest upstream release 2.2.0 - Add pymodbus.console with weak requirements to allow a minimal installation