From ed9bf6101ada9d68640ed59a9f6e072c5c0e0927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sat, 30 Mar 2019 11:15:10 +0100
Subject: [PATCH] Update to 1.6.0, update URL

---
 ...g-into-the-test-dir-it-isn-t-a-singl.patch | 29 -------------------
 0002-doc-use-a-list-for-html_sidebars.patch   | 27 -----------------
 python-execnet.spec                           | 17 ++++-------
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 68 deletions(-)
 delete mode 100644 0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch
 delete mode 100644 0002-doc-use-a-list-for-html_sidebars.patch

diff --git a/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch b/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch
deleted file mode 100644
index 2a63656..0000000
--- a/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f40ed2b844f888f0c745a8dd1a66801b30d38d27 Mon Sep 17 00:00:00 2001
-From: Anthony Sottile <asottile@umich.edu>
-Date: Thu, 5 Jul 2018 15:14:35 -0700
-Subject: [PATCH] Don't copy apipkg into the test dir -- it isn't a single file
- any more
-
----
- testing/test_termination.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/testing/test_termination.py b/testing/test_termination.py
-index 7320cdf..ae905d4 100644
---- a/testing/test_termination.py
-+++ b/testing/test_termination.py
-@@ -1,6 +1,5 @@
- import pytest
- import execnet
--import apipkg
- import subprocess
- import py
- import sys
-@@ -76,7 +75,6 @@ def test_close_initiating_remote_no_error(testdir, anypython):
-         print ("termination")
-         execnet.default_group.terminate()
-     """)
--    testdir.makepyfile(apipkg=apipkg)
-     popen = subprocess.Popen(
-         [str(anypython), str(p), str(execnetdir)],
-         stdout=None, stderr=subprocess.PIPE,)
diff --git a/0002-doc-use-a-list-for-html_sidebars.patch b/0002-doc-use-a-list-for-html_sidebars.patch
deleted file mode 100644
index 75ee73b..0000000
--- a/0002-doc-use-a-list-for-html_sidebars.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7424eab7dec61431646d050d87fd4c88a0bf69aa Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <kdreyer@redhat.com>
-Date: Mon, 18 Mar 2019 14:25:52 -0600
-Subject: [PATCH] doc: use a list for html_sidebars
-
-Sphinx 1.7 deprecated the use of a single string in html_sidebars, and
-Sphinx 2.0 has dropped support for this altogether.
----
- doc/conf.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/doc/conf.py b/doc/conf.py
-index f904768..7c049fb 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -98,10 +98,8 @@ html_theme = 'sphinxdoc'
- 
- # html_index = 'index.html'
- html_sidebars = {
--    'index': 'indexsidebar.html',
-+    'index': ['indexsidebar.html'],
- }
--#                 'basics': 'indexsidebar.html',
--# }
- # html_additional_pages = {'index': 'index.html'}
- 
- # Theme options are theme-specific and customize the look and feel of a theme
diff --git a/python-execnet.spec b/python-execnet.spec
index 44e4a69..8f31ade 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -1,16 +1,13 @@
 %global srcname execnet
 
 Name:           python-%{srcname}
-Version:        1.5.0
-Release:        7%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Distributed Python deployment and communication
 License:        MIT
-URL:            https://codespeak.net/execnet/
+URL:            https://github.com/pytest-dev/execnet
 Source0:        %pypi_source
 
-Patch0001: 0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch
-Patch0002: 0002-doc-use-a-list-for-html_sidebars.patch
-
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/ps
 
@@ -73,11 +70,6 @@ minimal and fast API targetting the following uses:
 %prep
 %setup -qc -n %{srcname}-%{version}
 
-pushd %{srcname}-%{version}
-%patch0001 -p1
-%patch0002 -p1
-popd
-
 mv %{srcname}-%{version} python2
 pushd python2
 
@@ -147,6 +139,9 @@ popd
 
 
 %changelog
+* Mon Apr 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.6.0-1
+- Update to 1.6.0
+
 * Mon Mar 18 2019 Ken Dreyer <kdreyer@redhat.com> - 1.5.0-7
 - Update Summary to match upstream
 - Use HTTPS in upstream URL
diff --git a/sources b/sources
index 529bf51..6cd17fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (execnet-1.5.0.tar.gz) = ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9
+SHA512 (execnet-1.6.0.tar.gz) = 0ac4e7cca95687aa318d696d91ec937b77dd305197b9a73b759fcaae6436eaa16f616aa8492a68de23d9b3aa80622a9924dece97d5afb78b35a9c43f1b6e3932