Sync with upstream release 68.0.
Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius
parent
b678a5f2c1
commit
fc19652d5e
6 changed files with 24 additions and 214 deletions
|
|
@ -12,10 +12,10 @@
|
|||
%global gittar %{srcname}-%{version}.tar.gz
|
||||
%else
|
||||
%if ! 0%{?commit:1}
|
||||
%global commit 1fe02ba801b3e76bb5a6b141b6272e8180bea49d
|
||||
%global commit ed7a0e2eb1f5b568c2a77a6e11917efb24d6aa8d
|
||||
%endif
|
||||
%if ! 0%{?commit_date:1}
|
||||
%global commit_date 20181217
|
||||
%global commit_date 20190213
|
||||
%endif
|
||||
%global shortcommit %(c=%{commit};echo ${c:0:8})
|
||||
%global gitrel .%{commit_date}git%{shortcommit}
|
||||
|
|
@ -48,8 +48,17 @@
|
|||
%global with_python3_fabric 0
|
||||
%endif
|
||||
|
||||
# Python2 binary packages are being removed
|
||||
# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
||||
# python2-resultsdb_api package has been removed in F30
|
||||
%if %{with python2} && ( (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) )
|
||||
%global with_python2_resultsdb 1
|
||||
%else
|
||||
%global with_python2_resultsdb 0
|
||||
%endif
|
||||
|
||||
Name: python-%{pkgname}
|
||||
Version: 67.0
|
||||
Version: 68.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
|
|
@ -61,15 +70,6 @@ License: GPLv2 and MIT
|
|||
URL: http://avocado-framework.github.io/
|
||||
Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar}
|
||||
BuildArch: noarch
|
||||
# Patch to make vmimage tests not depend on host arch
|
||||
# https://github.com/avocado-framework/avocado/commit/7c67cc73ad30dc784f6a98abab3bfd5c5fd05ece
|
||||
Patch0: python-avocado-67.0-vmimage-host-arch.patch
|
||||
# Patch upstream PyYAML versions, part 1
|
||||
# https://github.com/avocado-framework/avocado/commit/c60f0ae859e0df4ac748ddc2e5cc32207679c538
|
||||
Patch1: python-avocado-67.0-yaml-versions-1.patch
|
||||
# Patch upstream PyYAML versions, part 2
|
||||
# https://github.com/avocado-framework/avocado/commit/8be7c4fb325aa875e7d752975d61cd89f9239e7b
|
||||
Patch2: python-avocado-67.0-yaml-versions-2.patch
|
||||
|
||||
BuildRequires: procps-ng
|
||||
BuildRequires: kmod
|
||||
|
|
@ -108,9 +108,7 @@ BuildRequires: python-stevedore
|
|||
# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
||||
BuildRequires: python2-pycdlib
|
||||
%endif
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
# Python2 binary packages are being removed
|
||||
# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
||||
%if %{with_python2_resultsdb}
|
||||
BuildRequires: python2-resultsdb_api
|
||||
%endif
|
||||
%endif
|
||||
|
|
@ -172,9 +170,6 @@ these days a framework) to perform automated testing.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{gitref}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
# 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
|
||||
|
|
@ -227,10 +222,8 @@ pushd optional_plugins/runner_docker
|
|||
%endif
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with python2}
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%py2_build
|
||||
%endif
|
||||
%if %{with_python2_resultsdb}
|
||||
%py2_build
|
||||
%endif
|
||||
%if %{with python3}
|
||||
%py3_build
|
||||
|
|
@ -360,10 +353,8 @@ pushd optional_plugins/runner_docker
|
|||
%endif
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with python2}
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%py2_install
|
||||
%endif
|
||||
%if %{with_python2_resultsdb}
|
||||
%py2_install
|
||||
%endif
|
||||
%if %{with python3}
|
||||
%py3_install
|
||||
|
|
@ -476,7 +467,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
pushd optional_plugins/runner_docker
|
||||
%{__python2} setup.py develop --user
|
||||
popd
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%if %{with_python2_resultsdb}
|
||||
pushd optional_plugins/resultsdb
|
||||
%{__python2} setup.py develop --user
|
||||
popd
|
||||
|
|
@ -825,8 +816,7 @@ be previously installed on the container.
|
|||
%endif
|
||||
|
||||
|
||||
%if %{with python2}
|
||||
%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%if %{with_python2_resultsdb}
|
||||
%package -n python2-%{pkgname}-plugins-resultsdb
|
||||
Summary: Avocado plugin to propagate job results to ResultsDB
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb}
|
||||
|
|
@ -842,7 +832,6 @@ server.
|
|||
%{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info
|
||||
%config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-%{pkgname}-plugins-resultsdb
|
||||
|
|
@ -1137,6 +1126,9 @@ Again Shell code (and possibly other similar shells).
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 22 2019 Merlin Mathesius <mmathesi@redhat.com> - 68.0-1
|
||||
- Sync with upstream release 68.0.
|
||||
|
||||
* Thu Jan 31 2019 Merlin Mathesius <mmathesi@redhat.com> - 67.0-1
|
||||
- Sync with upstream release 67.0.
|
||||
- genisoimage, libcdio, and psmisc added as build deps so iso9660 tests run.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue