[pymodbus/f20] Update to new upstream release 1.2.0

[Christian Krause]

commit 3ae994c3a389ba21f73a23a75571a312d59a31f0
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Feb 11 22:48:56 2015 +0100

    Update to new upstream release 1.2.0
    
    - Add patch to avoid installation of ez_setup
    - Change URL and Source URL
    - Adjust requirements

 .gitignore                                         |  1 +
 ...ssue-60-on-google-code-including-ez_setup.patch | 57 ++++++++++++++++++++++
 pymodbus.spec                                      | 30 +++++++++---
 sources                                            |  2 +-
 4 files changed, 81 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b06ab0c..7a15ca0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pymodbus-0.9.0.tar.gz
+/pymodbus-75ac6a80573c332422067f9d72fc965306b6f141.tar.gz
diff --git a/0001-Fixing-issue-60-on-google-code-including-ez_setup.patch b/0001-Fixing-issue-60-on-google-code-including-ez_setup.patch
new file mode 100644
index 0000000..3aa2e44
--- /dev/null
+++ b/0001-Fixing-issue-60-on-google-code-including-ez_setup.patch
@@ -0,0 +1,57 @@
+From c44bc2e3b71b37bf5e330f7ae7789a62f2c605cb Mon Sep 17 00:00:00 2001
+From: Galen Collins <bashwork at gmail.com>
+Date: Wed, 2 May 2012 14:12:18 -0500
+Subject: [PATCH] Fixing issue 60 on google code (including ez_setup)
+
+---
+ setup.py | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 59dcc95..8a07590 100644
+--- a/setup.py
++++ b/setup.py
+@@ -9,18 +9,25 @@ to install the package from the source archive.
+ For information about setuptools
+ http://peak.telecommunity.com/DevCenter/setuptools#new-and-changed-setup-keywords
+ '''
++#---------------------------------------------------------------------------# 
++# initialization
++#---------------------------------------------------------------------------# 
+ 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
+ 
+-#---------------------------------------------------------------------------# 
+-# Configuration
+-#---------------------------------------------------------------------------# 
+-from setup_commands import command_classes
++try:
++    from setup_commands import command_classes
++except ImportError:
++    command_classes = {}
+ from pymodbus import __version__, __author__
+ 
++#---------------------------------------------------------------------------# 
++# configuration
++#---------------------------------------------------------------------------# 
+ setup(name  = 'pymodbus',
+     version = __version__,
+     description = 'A fully featured modbus protocol stack in python',
+@@ -49,8 +56,9 @@ setup(name  = 'pymodbus',
+     maintainer_email = 'bashwork at gmail.com',
+     url='http://code.google.com/p/pymodbus/',
+     license = 'BSD',
+-    packages = find_packages(exclude=['ez_setup', 'examples', 'test', 'doc']),
++    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,
+-- 
+1.9.3
+
diff --git a/pymodbus.spec b/pymodbus.spec
index 5701037..6913737 100644
--- a/pymodbus.spec
+++ b/pymodbus.spec
@@ -1,18 +1,25 @@
+# commit for https://github.com/bashwork/pymodbus/releases/tag/v1.2.0
+%global commit 75ac6a80573c332422067f9d72fc965306b6f141
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name: pymodbus
-Version: 0.9.0
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 Summary: A Modbus Protocol Stack in Python
 
 Group: Development/Languages
 License: BSD
-URL: http://code.google.com/p/pymodbus/
-Source0: http://pymodbus.googlecode.com/files/pymodbus-%{version}.tar.gz
+URL: https://github.com/bashwork/pymodbus
+Source0: https://github.com/bashwork/pymodbus/archive/%{commit}/%{name}-%{commit}.tar.gz
+# reverse upstream patch c44bc2e3b71b37bf5e330f7ae7789a62f2c605cb
+# to avoid packaging ez_setup
+Patch0: 0001-Fixing-issue-60-on-google-code-including-ez_setup.patch
 BuildArch: noarch
 BuildRequires: python2-devel
 BuildRequires: python-setuptools-devel
-Requires: python-twisted >= 2.5.0
-Requires: python-nose >= 0.9.3
-Requires: pyserial >= 2.4
+Requires: python-twisted >= 12.2.0
+Requires: python-nose >= 1.2.1
+Requires: pyserial >= 2.6
 
 %description
 Pymodbus is a full Modbus protocol implementation using twisted for its
@@ -37,7 +44,8 @@ Server Features
     * A number of backing contexts (database, redis, a slave device)
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
+%patch0 -p1 -R -b.no_ez_setup
 
 %build
 %{__python} setup.py build
@@ -50,6 +58,12 @@ Server Features
 %{python_sitelib}/*
 
 %changelog
+* Mon Feb 09 2015 Christian Krause <chkr at fedoraproject.org> - 1.2.0-1
+- Update to new upstream release 1.2.0
+- Add patch to avoid installation of ez_setup
+- Change URL and Source URL
+- Adjust requirements
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index dabc0f9..205fe9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea3f3b23a443ee80975514b40f11ece4  pymodbus-0.9.0.tar.gz
+464fa063af6830b3eff8b3f5ea465533  pymodbus-75ac6a80573c332422067f9d72fc965306b6f141.tar.gz