From f0e8a0cec7e119befc8d91ab6fe62abc651977124cb63cfbf7184fb3eb27312f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 11 Aug 2018 14:56:07 +0000
Subject: [PATCH] - Version update to 2.3.1:   * Adds support for python3   *
 Supports new invoke and invocations modules - Run tests - Add all
 build/runtime dependencies

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Fabric?expand=0&rev=55
---
 Fabric-1.14.0.tar.gz  |  3 ---
 fabric-2.3.1.tar.gz   |  3 +++
 python-Fabric.changes |  9 ++++++++
 python-Fabric.spec    | 51 ++++++++++++++++++++++++++++---------------
 4 files changed, 45 insertions(+), 21 deletions(-)
 delete mode 100644 Fabric-1.14.0.tar.gz
 create mode 100644 fabric-2.3.1.tar.gz

diff --git a/Fabric-1.14.0.tar.gz b/Fabric-1.14.0.tar.gz
deleted file mode 100644
index d42997c..0000000
--- a/Fabric-1.14.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81572002a562b26df657ca10d06b5bcfc6fd56b53374037392c83d4a2158208f
-size 219294
diff --git a/fabric-2.3.1.tar.gz b/fabric-2.3.1.tar.gz
new file mode 100644
index 0000000..e74b108
--- /dev/null
+++ b/fabric-2.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:178228b94548194c2e6ff008a51b636d5b19b2eb7551996770d7c999188cf88a
+size 148829
diff --git a/python-Fabric.changes b/python-Fabric.changes
index 3389ac0..64f1ff0 100644
--- a/python-Fabric.changes
+++ b/python-Fabric.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Aug 11 14:54:57 UTC 2018 - tchvatal@suse.com
+
+- Version update to 2.3.1:
+  * Adds support for python3
+  * Supports new invoke and invocations modules
+- Run tests
+- Add all build/runtime dependencies
+
 -------------------------------------------------------------------
 Mon Jan 22 11:15:30 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-Fabric.spec b/python-Fabric.spec
index 4e7b7b9..24615a1 100644
--- a/python-Fabric.spec
+++ b/python-Fabric.spec
@@ -17,26 +17,34 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python3 1
 Name:           python-Fabric
-Version:        1.14.0
+Version:        2.3.1
 Release:        0
 Summary:        A Pythonic tool for remote execution and deployment
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Url:            http://fabfile.org
-Source:         https://files.pythonhosted.org/packages/source/F/Fabric/Fabric-%{version}.tar.gz
-BuildRequires:  %{python_module Jinja2}
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module fudge}
-BuildRequires:  %{python_module nose}
-BuildRequires:  %{python_module paramiko >= 1.10}
+URL:            http://fabfile.org
+Source:         https://files.pythonhosted.org/packages/source/f/fabric/fabric-%{version}.tar.gz
+BuildRequires:  %{python_module cryptography >= 1.1}
+BuildRequires:  %{python_module decorator}
+BuildRequires:  %{python_module invoke >= 1.1}
+BuildRequires:  %{python_module mock >= 2.0.0}
+BuildRequires:  %{python_module paramiko >= 2.4}
+BuildRequires:  %{python_module pytest >= 3.2.5}
+BuildRequires:  %{python_module pytest-relaxed}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-paramiko >= 1.10
+Requires:       python-cryptography >= 1.1
+Requires:       python-decorator
+Requires:       python-invoke >= 1.1
+Requires:       python-paramiko >= 2.4
 Requires:       python-setuptools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       python-six
+Provides:       python-Fabric2 = %{version}
+Provides:       python-fabric = %{version}
+Provides:       python-fabric2 = %{version}
 BuildArch:      noarch
 %python_subpackages
 
@@ -56,9 +64,7 @@ suite at a higher level than that provided by e.g. Paramiko (which
 Fabric itself leverages).
 
 %prep
-%setup -q -n Fabric-%{version}
-sed -i 's/paramiko>=1.10,<2.0/paramiko>=1.10/g' setup.py # new paramiko is okay
-sed -i "s|fudge<1.0|fudge|" setup.py # Try testing with newer fudge
+%setup -q -n fabric-%{version}
 
 %build
 %python_build
@@ -66,14 +72,23 @@ sed -i "s|fudge<1.0|fudge|" setup.py # Try testing with newer fudge
 %install
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python_clone -a %{buildroot}%{_bindir}/fab
 
 %check
-# Breaks on the raise tests completely even in git
-#%%python_exec setup.py test
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+py.test-%{$python_bin_suffix} tests/
+}
+
+%post
+%python_install_alternative fab
+
+%postun
+%python_uninstall_alternative fab
 
 %files %{python_files}
-%doc AUTHORS LICENSE README.rst
-%python2_only %{_bindir}/fab
+%license LICENSE
+%doc README.rst
+%python_alternative %{_bindir}/fab
 %{python_sitelib}/*
 
 %changelog