diff --git a/.gitignore b/.gitignore index c0d48ae..019acbb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /v1.5.0.tar.gz /v1.5.1.tar.gz /v2.2.0.tar.gz +/v2.3.0.tar.gz diff --git a/pymodbus-2.2.0-correct-deps.patch b/pymodbus-2.2.0-correct-deps.patch deleted file mode 100644 index 1ecb01f..0000000 --- a/pymodbus-2.2.0-correct-deps.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 7746557..68e7fda 100644 --- a/pymodbus.spec +++ b/pymodbus.spec @@ -21,8 +21,8 @@ Server Features \ * A number of backing contexts (database, redis, a slave device) Name: pymodbus -Version: 2.2.0 -Release: 5%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: %{sum} License: BSD @@ -30,9 +30,6 @@ 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 @@ -58,8 +55,7 @@ Recommends: python3-click %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .no_ez_setup -%patch1 -p1 -b .correct-deps +%patch0 -F 2 -p1 -b .no_ez_setup %build %py3_build @@ -71,7 +67,7 @@ Recommends: python3-click # install LICENSE, Changelog and READMEs %{__mkdir} -p %{buildroot}%{_docdir}/%{name} -%{__install} -m 644 -p doc/LICENSE %{buildroot}%{_docdir}/%{name} +%{__install} -m 644 -p LICENSE %{buildroot}%{_docdir}/%{name} %{__install} -m 644 -p CHANGELOG.rst %{buildroot}%{_docdir}/%{name}/CHANGELOG %{__install} -m 644 -p README.rst %{buildroot}%{_docdir}/%{name}/ %{__install} -m 644 -p pymodbus/repl/README.md %{buildroot}%{_docdir}/%{name}/ @@ -84,6 +80,10 @@ Recommends: python3-click %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/ %changelog +* Tue Nov 19 2019 Christian Krause - 2.3.0-1 +- Updated to the latest upstream release 2.3.0 +- Removed patch for dependency issue (fixed upstream) + * Thu Oct 03 2019 Miro HronĨok - 2.2.0-5 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 1cf1f9b..eef19fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.2.0.tar.gz) = 309833d2753cefa61d9baba7bcfdf32f2c347bbe0363f15993b3eb1d6ac391af7267b91a102d94deee6b1fb4591b9dba066ae4f14a73d1300b9642bc6ba61059 +SHA512 (v2.3.0.tar.gz) = 7e9b78e4b1394d16556843fbb5d06890de58059d185c763e0e13043ec6fd0c3236859f2eca6c720142a57746c0b9ced46fb409b1639c6f61801a76c976669933