diff --git a/.gitignore b/.gitignore index 00c20cb..91e3e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pymodbus-0.9.0.tar.gz /pymodbus-75ac6a80573c332422067f9d72fc965306b6f141.tar.gz /v1.3.1.tar.gz +/v1.4.0.tar.gz diff --git a/pymodbus-1.3.1-remove-ez_setup.patch b/pymodbus-1.3.1-remove-ez_setup.patch deleted file mode 100644 index 7ea5613..0000000 --- a/pymodbus-1.3.1-remove-ez_setup.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/setup.py b/setup.py -index 258524c..b85c4bd 100644 ---- a/setup.py -+++ b/setup.py -@@ -15,8 +15,6 @@ http://peak.telecommunity.com/DevCenter/setuptools#new-and-changed-setup-keyword - try: # if not installed, install and proceed - from setuptools import setup, find_packages - except ImportError: -- from ez_setup import use_setuptools -- use_setuptools() - from setuptools import setup, find_packages - - try: -@@ -58,7 +56,6 @@ setup(name = 'pymodbus', - license = 'BSD', - packages = find_packages(exclude=['examples', 'test']), - exclude_package_data = {'' : ['examples', 'test', 'tools', 'doc']}, -- py_modules = ['ez_setup'], - platforms = ['Linux', 'Mac OS X', 'Win'], - include_package_data = True, - zip_safe = True, diff --git a/pymodbus-1.4.0-remove-ez_setup.patch b/pymodbus-1.4.0-remove-ez_setup.patch new file mode 100644 index 0000000..5616af8 --- /dev/null +++ b/pymodbus-1.4.0-remove-ez_setup.patch @@ -0,0 +1,20 @@ +diff -uNr pymodbus-1.4.0.old/setup.py pymodbus-1.4.0/setup.py +--- pymodbus-1.4.0.old/setup.py 2018-01-03 08:15:31.000000000 +0100 ++++ pymodbus-1.4.0/setup.py 2018-04-15 23:24:10.482205858 +0200 +@@ -16,8 +16,6 @@ + try: # if not installed, install and proceed + from setuptools import setup, find_packages + except ImportError: +- from ez_setup import use_setuptools +- use_setuptools() + from setuptools import setup, find_packages + + try: +@@ -61,7 +59,6 @@ + license='BSD', + packages=find_packages(exclude=['examples', 'test']), + exclude_package_data={'': ['examples', 'test', 'tools', 'doc']}, +- py_modules=['ez_setup'], + platforms=['Linux', 'Mac OS X', 'Win'], + include_package_data=True, + zip_safe=True, diff --git a/pymodbus.spec b/pymodbus.spec index 6a76b21..ecd6f22 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: 1.3.1 -Release: 3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: %{sum} Group: Development/Languages @@ -30,7 +30,7 @@ License: BSD 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.3.1-remove-ez_setup.patch +Patch0: pymodbus-1.4.0-remove-ez_setup.patch BuildArch: noarch BuildRequires: python2-devel python3-devel @@ -81,8 +81,8 @@ Requires: python3-pyserial >= 2.6 # install LICENSE and Changelog %{__mkdir} -p %{buildroot}%{_docdir}/%{name} -%{__install} -p doc/LICENSE %{buildroot}%{_docdir}/%{name} -%{__install} -p CHANGELOG.rst %{buildroot}%{_docdir}/%{name}/CHANGELOG +%{__install} -m 644 -p doc/LICENSE %{buildroot}%{_docdir}/%{name} +%{__install} -m 644 -p CHANGELOG.rst %{buildroot}%{_docdir}/%{name}/CHANGELOG %files -n python2-%{name} %license %{_docdir}/%{name}/LICENSE @@ -95,6 +95,10 @@ Requires: python3-pyserial >= 2.6 %{python3_sitelib}/* %changelog +* Thu Apr 19 2018 Christian Krause - 1.4.0-1 +- Updated to the latest upstream release 1.4.0 +- Updated patch to disable ez_setup + * Fri Feb 09 2018 Fedora Release Engineering - 1.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index f05a730..b1a3d2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.3.1.tar.gz) = c8e6e8751012875a6410ee9119af04cf39cd017de36c0f37d49ae33a178c26abb98e9e92e44914638bcdbbd4616de4906d19bb36c6a8e3e956b03341c0265b5c +SHA512 (v1.4.0.tar.gz) = 7a9669fd00e4f7551d1933c5ca6d2b72d1624b60d691a9afb2680e97684e7d2252c81c4bafe80f8d54259b22b438409eaaa53ab647fb5e832eb99c498180b18d