From 9c79be072dabbd55654aa1ce1aaad068597ae051 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Oct 02 2019 19:13:46 +0000
Subject: Sync with upstream release 72.0.


Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 25c9dfa..364f51c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /avocado-69.0.tar.gz
 /avocado-70.0.tar.gz
 /avocado-71.0.tar.gz
+/avocado-72.0.tar.gz
diff --git a/python-avocado.spec b/python-avocado.spec
index 439a321..982f1e1 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -12,10 +12,10 @@
     %global gittar          %{srcname}-%{version}.tar.gz
 %else
     %if ! 0%{?commit:1}
-        %global commit      d4d83d890b09f60eb5d27a30a5a315e45307f188
+        %global commit      a918b7f3ac80bc45c9577a8f38ef069017d114c7
     %endif
     %if ! 0%{?commit_date:1}
-        %global commit_date 20190815
+        %global commit_date 20190917
     %endif
     %global shortcommit     %(c=%{commit};echo ${c:0:8})
     %global gitrel          .%{commit_date}git%{shortcommit}
@@ -50,7 +50,7 @@
 %endif
 
 Name: python-%{pkgname}
-Version: 71.0
+Version: 72.0
 Release: 1%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 Group: Development/Tools
@@ -107,10 +107,6 @@ these days a framework) to perform automated testing.
 
 %prep
 %setup -q -n %{srcname}-%{gitref}
-# package plugins-runner-vm requires libvirt-python, but the RPM
-# version of libvirt-python does not publish the egg info and this
-# causes that dep to be attempted to be installed by pip
-sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py
 %if 0%{?rhel} && 0%{?rhel} <= 7
 sed -e "s/'six>=1.10.0'/'six>=1.9.0'/" -i setup.py
 sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.10'/" -i optional_plugins/varianter_yaml_to_mux/setup.py
@@ -173,16 +169,16 @@ popd
 
 %install
 %py3_install
-%{__mv} %{buildroot}%{_bindir}/avocado %{buildroot}%{_bindir}/avocado-%{python3_version}
-%{__ln_s} avocado-%{python3_version} %{buildroot}%{_bindir}/avocado-3
+for exe in avocado avocado-runner avocado-runner-avocado-instrumented; do
+    %{__mv} %{buildroot}%{_bindir}/$exe %{buildroot}%{_bindir}/$exe-%{python3_version}
+    %{__ln_s} $exe-%{python3_version} %{buildroot}%{_bindir}/$exe-3
+    %{__ln_s} $exe-%{python3_version} %{buildroot}%{_bindir}/$exe
+done
 # configuration is held at /etc/avocado only and part of the
 # python-avocado-common package
 %{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/etc
 # ditto for libexec files
 %{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/libexec
-# Unversioned executables should now be the Python 3 version if shipping with Python 3
-#   https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/
-%{__ln_s} avocado-%{python3_version} %{buildroot}%{_bindir}/avocado
 pushd optional_plugins/html
     %py3_install
 popd
@@ -342,6 +338,12 @@ these days a framework) to perform automated testing.
 %{_bindir}/avocado-%{python3_version}
 %{_bindir}/avocado-3
 %{_bindir}/avocado
+%{_bindir}/avocado-runner-%{python3_version}
+%{_bindir}/avocado-runner-3
+%{_bindir}/avocado-runner
+%{_bindir}/avocado-runner-avocado-instrumented-%{python3_version}
+%{_bindir}/avocado-runner-avocado-instrumented-3
+%{_bindir}/avocado-runner-avocado-instrumented
 
 
 %package -n python-%{pkgname}-common
@@ -609,6 +611,9 @@ Again Shell code (and possibly other similar shells).
 
 
 %changelog
+* Wed Oct 02 2019 Merlin Mathesius <mmathesi@redhat.com> - 72.0-1
+- Sync with upstream release 72.0.
+
 * Wed Aug 28 2019 Merlin Mathesius <mmathesi@redhat.com> - 71.0-1
 - Sync with upstream release 71.0.
 
diff --git a/sources b/sources
index 807a9b6..96402fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (avocado-71.0.tar.gz) = d997489e284392adc7787f6c6a464f64293a619c3db9b21a8de98de07a8ee5b1c398b63b9aa216a1d036581c13b763308f8e2a8e6aaee9fac69782455ee79225
+SHA512 (avocado-72.0.tar.gz) = 291a399197c95abb7ed3a18c79793020542a928185652999fffe3042cca530422234d44916261cad26bfb08932a57dd5db8db0412bec0f071fe9a7cbd8505076