Sync with upstream release 61.0.

Packaging updates for Python 3.
Reorganize SPEC file.

.gitignore

@@ -7,3 +7,4 @@
 /avocado-51.0.tar.gz
 /avocado-52.0.tar.gz
 /avocado-52.1.tar.gz
+/avocado-61.0.tar.gz

avocado-61.0-correct-data_structures-identity-check.patch

@@ -0,0 +1,15 @@
+diff --git a/selftests/unit/test_data_structures.py b/selftests/unit/test_data_structures.py
+index 60f649663..50a18b26f 100644
+--- a/selftests/unit/test_data_structures.py
++++ b/selftests/unit/test_data_structures.py
+@@ -113,8 +113,8 @@ def test_invalid(self):
+                           data_structures.DataSize, '10Mb')
+ 
+     def test_value_and_type(self):
+-        self.assertIs(data_structures.DataSize('0b').b, 0)
+-        self.assertIs(data_structures.DataSize('0t').b, 0)
++        self.assertEqual(data_structures.DataSize('0b').b, 0)
++        self.assertEqual(data_structures.DataSize('0t').b, 0)
+ 
+     def test_values(self):
+         self.assertEqual(data_structures.DataSize('10m').b, 10485760)

avocado-61.0-skip-remote-test-if-plugin-unavailable.patch

@@ -0,0 +1,62 @@
+From 0cc70f1c8a41260640dfc7a660c11bcb1a163419 Mon Sep 17 00:00:00 2001
+From: Cleber Rosa <crosa@redhat.com>
+Date: Thu, 3 May 2018 21:05:43 +0200
+Subject: [PATCH] Replay with remote functional test: skip if remote plugin is
+ not available
+
+When a plugin is not installed, its command line options are not
+registered with the optparse based code.  That is caught earlier than
+Avocado's own handling of incompatible options (in this case, the replay
+and the remote runner), and results in the errors such as:
+
+  avocado run: error: unrecognized arguments: --remote-hostname
+
+When building RPM packages for Python 3, the remote runner plugin is
+not available, and this test should be skipped.
+
+Signed-off-by: Cleber Rosa <crosa@redhat.com>
+---
+ selftests/functional/test_replay_basic.py | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/selftests/functional/test_replay_basic.py b/selftests/functional/test_replay_basic.py
+index 56f94d315..6eb944aa2 100644
+--- a/selftests/functional/test_replay_basic.py
++++ b/selftests/functional/test_replay_basic.py
+@@ -1,9 +1,11 @@
+ import glob
+ import os
+-import tempfile
+ import shutil
++import tempfile
+ import unittest
+ 
++import pkg_resources
++
+ from avocado.core import exit_codes
+ from avocado.utils import process
+ 
+@@ -14,6 +16,14 @@
+ AVOCADO = os.environ.get("UNITTEST_AVOCADO_CMD", "./scripts/avocado")
+ 
+ 
++def remote_capable():
++    try:
++        pkg_resources.require('avocado-framework-plugin-runner-remote')
++        return True
++    except pkg_resources.DistributionNotFound:
++        return False
++
++
+ class ReplayTests(unittest.TestCase):
+ 
+     def setUp(self):
+@@ -148,6 +158,8 @@ def test_run_replay_statusfail(self):
+                b'INTERRUPT 0')
+         self.assertIn(msg, result.stdout)
+ 
++    @unittest.skipUnless(remote_capable(),
++                         "Remote runner plugin is not available")
+     def test_run_replay_remotefail(self):
+         """
+         Runs a replay job using remote plugin (not supported).

avocado-selftest-doublefree-disable.patch

@@ -1,11 +0,0 @@
-diff -r -u avocado-52.0.orig/selftests/functional/test_output.py avocado-52.0/selftests/functional/test_output.py
---- avocado-52.0.orig/selftests/functional/test_output.py	2017-06-26 19:26:48.000000000 -0500
-+++ avocado-52.0/selftests/functional/test_output.py	2017-08-09 07:40:41.636928188 -0500
-@@ -67,6 +67,7 @@
-     def setUp(self):
-         self.tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__)
- 
-+    @unittest.skip("Test is producing a false failure due to platform/compiler changes")
-     @unittest.skipIf(missing_binary('cc'),
-                      "C compiler is required by the underlying doublefree.py test")
-     def test_output_doublefree(self):

avocado-selftest-fix-cmdline-check.patch

@@ -1,15 +0,0 @@
-diff -ru ../avocado-52.1.orig/selftests/functional/test_plugin_diff.py ./selftests/functional/test_plugin_diff.py
---- ../avocado-52.1.orig/selftests/functional/test_plugin_diff.py	2018-03-01 12:05:02.000000000 -0600
-+++ ./selftests/functional/test_plugin_diff.py	2018-03-13 16:50:33.662490323 -0500
-@@ -52,9 +52,9 @@
-         result = self.run_and_check(cmd_line, expected_rc)
-         msg = "# COMMAND LINE"
-         self.assertIn(msg, result.stdout)
--        msg = "-./scripts/avocado run"
-+        msg = "-%s run" % AVOCADO
-         self.assertIn(msg, result.stdout)
--        msg = "+./scripts/avocado run"
-+        msg = "+%s run" % AVOCADO
-         self.assertIn(msg, result.stdout)
- 
-     def test_diff_nocmdline(self):

sources

@@ -1 +1 @@
-SHA512 (avocado-52.1.tar.gz) = fb97ea6056700f57f34e8e4ce0c27774c386d646aaffc7da2abb8d0a797cff4448934789ffaf81da1592fceae1bb464da2b5dde000730c4f417b03552a432c6c
+SHA512 (avocado-61.0.tar.gz) = f1d5c73ec718751e615f63fb1bc0089b3351432395705d83450c88f5d429009687de3f145b90f018d34eb6abbe1ddb953b622e1fee450264a046338cc8d9b217