From 01977b4db3d06bdab733072ff234c9c6c852fa77 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 16 2017 20:37:28 +0000
Subject: New release 0.8.6


Backport a patch needed for tests, update some dependencies to
use versioned Provides: names now f24 is out of support, don't
use commit ID but version name for tarball now we're allowed to
do that.

---

diff --git a/.gitignore b/.gitignore
index f466743..04c9e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ mwclient-0.6.5.zip
 /mwclient-0.8.1.tar.gz
 /mwclient-0.8.3.tar.gz
 /mwclient-0.8.4.tar.gz
+/v0.8.6.tar.gz
diff --git a/0001-use-exec-in-py3-compatible-manner.patch b/0001-use-exec-in-py3-compatible-manner.patch
deleted file mode 100644
index 08df20c..0000000
--- a/0001-use-exec-in-py3-compatible-manner.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5de1bb82465d39962e26175c62f644a3e423d030 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Thu, 21 Jan 2016 17:21:52 -0800
-Subject: [PATCH] use 'exec' in py3-compatible manner
-
-per https://docs.python.org/2/reference/simple_stmts.html ,
-as exec is a function not a statement in py3, the py2 version
-has been set to allow the subsequent statement to be a tuple,
-so we can invoke it like this to make it both py2 and py3
-compatible. Without this, byte-compiling the file fails under
-py3.
----
- mwclient/ex.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mwclient/ex.py b/mwclient/ex.py
-index db4006c..c0b1eae 100644
---- a/mwclient/ex.py
-+++ b/mwclient/ex.py
-@@ -12,7 +12,7 @@ def read_config(config_files, **predata):
- 
- def _read_config_file(_config_file, predata):
-     _file = open(_config_file)
--    exec _file in globals(), predata
-+    exec(_file, globals(), predata)
-     _file.close()
- 
-     for _k, _v in predata.iteritems():
--- 
-2.7.0
-
diff --git a/python-mwclient.spec b/python-mwclient.spec
index 8419af9..67a7bd7 100644
--- a/python-mwclient.spec
+++ b/python-mwclient.spec
@@ -12,17 +12,19 @@
 
 %global github_owner    mwclient
 %global github_name     mwclient
-%global github_commit   e2f4a22120a2d1f839160845aaaab87ef30a3088
 
 Name:           python-mwclient
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Mwclient is a client to the MediaWiki API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            https://github.com/%{github_owner}/%{github_name}
-Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{version}.tar.gz
+Source0:        https://github.com/%{github_owner}/%{github_name}/archive/v%{version}.tar.gz
+# Restore compatibility with older python-responses
+# https://github.com/mwclient/mwclient/pull/177
+Patch0:         0001-Revert-Fix-test-compat-with-responses-0.6.0.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -30,14 +32,12 @@ BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 %if 0%{?with_tests}
 BuildRequires:  python2-pytest
-# Provides: python2-pytest-pep8 missing
+# Provides: python2-pytest-pep8 missing on < F26
 BuildRequires:  python-pytest-pep8
-# Provides: python2-pytest-cache missing on < F24
-BuildRequires:  python-pytest-cache
-# Provides: python2-pytest-cov missing on < F24
-BuildRequires:  python-pytest-cov
-# Provides: python2-mock missing on < F24
-BuildRequires:  python-mock
+BuildRequires:  python2-pytest-cache
+BuildRequires:  python2-pytest-cov
+BuildRequires:  python2-pytest-runner
+BuildRequires:  python2-mock
 BuildRequires:  python2-funcsigs
 BuildRequires:  python2-responses >= 0.3.0
 BuildRequires:  %{test_requires2}
@@ -49,6 +49,7 @@ BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-pep8
 BuildRequires:  python3-pytest-cache
 BuildRequires:  python3-pytest-cov
+BuildRequires:  python3-pytest-runner
 BuildRequires:  python3-mock
 BuildRequires:  python3-funcsigs
 BuildRequires:  python3-responses >= 0.3.0
@@ -85,7 +86,7 @@ provides access to most API functionality. This is the Python 3 build of
 %endif # if with_python3
 
 %prep
-%autosetup -n %{github_name}-%{github_commit}
+%autosetup -p1 -n %{github_name}-%{version}
 
 
 %build
@@ -125,6 +126,10 @@ provides access to most API functionality. This is the Python 3 build of
 
 
 %changelog
+* Thu Nov 16 2017 Adam Williamson <awilliam@redhat.com> - 0.8.6-1
+- New release 0.8.6
+- Backport PR #177 to restore compatibility with older responses
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index c866d60..a7f091a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mwclient-0.8.4.tar.gz) = 3c058865995eb1fcc4ef5758f8713081b388869073a9a8723886661637de2b992e985b4ad23f5b39db3dca1d3fe5f353bef922eb580f9322cae6ee21590a9876
+SHA512 (v0.8.6.tar.gz) = 620e9726babfb6dbb84032a0e05094e1416d8aa9e1d87f09d6e000acafb3155410a2e7339e7ca88144aebdb542415d3d58d2d67034f4e9c9d664eae7a97e14c6