From 0f28bcd9e10f4e8a0c877841526cfbf4bb607d1e Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 14 Sep 2020 19:00:31 -0400 Subject: [PATCH] Sync with upstream release 82.0. Signed-off-by: Cleber Rosa --- .gitignore | 1 + python-avocado.spec | 35 ++++++++++++----------------------- sources | 2 +- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index ad6a911..bf17c05 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /avocado-78.0.tar.gz /avocado-79.0.tar.gz /avocado-80.0.tar.gz +/avocado-82.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 04ff584..d8ed3a8 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,12 +12,12 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit fbde0850d46bc1bbd2fb059a69d9d2ba9d496920 + %global commit e97540793998c4f24a16000465dd7fdd213bf2b9 %endif %if ! 0%{?commit_date:1} - %global commit_date 20200605 + %global commit_date 20200911 %endif - %global shortcommit %(c=%{commit};echo ${c:0:8}) + %global shortcommit %(c=%{commit};echo ${c:0:9}) %global gitrel .%{commit_date}git%{shortcommit} %global gitref %{commit} %global gittar %{srcname}-%{shortcommit}.tar.gz @@ -37,7 +37,7 @@ %endif Name: python-%{pkgname} -Version: 80.0 +Version: 82.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -80,11 +80,6 @@ BuildRequires: glibc-all-langpacks %endif BuildRequires: python3-netifaces BuildRequires: python3-yaml -%if 0%{?fedora} >= 27 || 0%{?rhel} -BuildRequires: python3-libvirt -%else -BuildRequires: libvirt-python3 -%endif %endif # with_tests @@ -98,9 +93,6 @@ these days a framework) to perform automated testing. %if (0%{?fedora} && 0%{?fedora} < 29) || 0%{?rhel} sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py %endif -%if ! %{with_resultsdb} -%{__rm} -f avocado/etc/avocado/conf.d/resultsdb.conf -%endif %build %py3_build @@ -189,9 +181,6 @@ popd # cleanup plugin test cruft %{__rm} -rf %{buildroot}%{python3_sitelib}/tests %{__mkdir} -p %{buildroot}%{_sysconfdir}/avocado -%{__cp} avocado/etc/avocado/avocado.conf %{buildroot}%{_sysconfdir}/avocado/avocado.conf -%{__sed} -e "s| etc/avocado/sysinfo/| /etc/avocado/sysinfo/|" -i %{buildroot}%{_sysconfdir}/avocado/avocado.conf -%{__cp} -r avocado/etc/avocado/conf.d %{buildroot}%{_sysconfdir}/avocado/conf.d %{__cp} -r avocado/etc/avocado/scripts %{buildroot}%{_sysconfdir}/avocado/scripts %{__cp} -r avocado/etc/avocado/sysinfo %{buildroot}%{_sysconfdir}/avocado/sysinfo %{__mkdir} -p %{buildroot}%{_libexecdir}/avocado @@ -323,19 +312,14 @@ Common files (such as configuration) for the Avocado Testing Framework. %dir %{_docdir}/avocado %dir %{_sharedstatedir}/avocado %dir %{_sysconfdir}/avocado -%dir %{_sysconfdir}/avocado/conf.d %dir %{_sysconfdir}/avocado/sysinfo %dir %{_sysconfdir}/avocado/scripts %dir %{_sysconfdir}/avocado/scripts/job %dir %{_sysconfdir}/avocado/scripts/job/pre.d %dir %{_sysconfdir}/avocado/scripts/job/post.d -%config(noreplace) %{_sysconfdir}/avocado/avocado.conf -%config(noreplace) %{_sysconfdir}/avocado/conf.d/gdb.conf -%config(noreplace) %{_sysconfdir}/avocado/conf.d/jobscripts.conf %config(noreplace) %{_sysconfdir}/avocado/sysinfo/commands %config(noreplace) %{_sysconfdir}/avocado/sysinfo/files %config(noreplace) %{_sysconfdir}/avocado/sysinfo/profilers -%{_sysconfdir}/avocado/conf.d/README %{_sysconfdir}/avocado/scripts/job/pre.d/README %{_sysconfdir}/avocado/scripts/job/post.d/README @@ -370,7 +354,6 @@ server. %files -n python3-%{pkgname}-plugins-resultsdb %{python3_sitelib}/avocado_resultsdb/ %{python3_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python3_version}.egg-info -%config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf %endif # with_resultsdb @@ -460,7 +443,6 @@ a dedicated sever. %files -n python3-%{pkgname}-plugins-result-upload %{python3_sitelib}/avocado_result_upload/ %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info -%config(noreplace) %{_sysconfdir}/avocado/conf.d/result_upload.conf %package -n python3-%{pkgname}-plugins-glib @@ -475,7 +457,6 @@ GLib Test Framework. %files -n python3-%{pkgname}-plugins-glib %{python3_sitelib}/avocado_glib/ %{python3_sitelib}/avocado_framework_plugin_glib-%{version}-py%{python3_version}.egg-info -%config(noreplace) %{_sysconfdir}/avocado/conf.d/glib.conf %package -n python-%{pkgname}-examples @@ -519,6 +500,14 @@ Again Shell code (and possibly other similar shells). %changelog +* Mon Sep 14 2020 Cleber Rosa - 82.0-1 +- Sync with upstream release 82.0. +- Removed python libvirt depedency as the vm runner has been removed + upstream +- Dropped configuration files to sync with upstream which made them + optional and doesn't ship them anymore +- Add on extra character to short commit to sync with upstream + * Sat Jun 6 2020 Cleber Rosa - 80.0-1 - Sync with upstream release 80.0. - Dropped use of custom avocado command for tests diff --git a/sources b/sources index 7004584..4721c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-80.0.tar.gz) = 325d0973591235a5279773eb72063ffacdc8f0d2306ec86b9955a9d5265f5ed28b7e1b6eabf598072e917d65781a2b89bfd474c771f2138dded6916bd723e626 +SHA512 (avocado-82.0.tar.gz) = 099ab131b2b941602550e71507e4ca517d5d2cd5152b255edace0473c9de93aac8163a61689414b5b58f9211f58981c3c30c1c3ca8a191283f609722ce07f173