Sync with upstream release 65.0.
Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
parent
f0e9dccf5c
commit
2b15941a13
4 changed files with 51 additions and 6 deletions
|
|
@ -12,10 +12,10 @@
|
|||
%global gittar %{srcname}-%{version}.tar.gz
|
||||
%else
|
||||
%if ! 0%{?commit:1}
|
||||
%global commit d969799cd6d9705133f09f85be4d5687ac85154e
|
||||
%global commit 7d401ce5add925856ff9620007eb492a56f28001
|
||||
%endif
|
||||
%if ! 0%{?commit_date:1}
|
||||
%global commit_date 20180827
|
||||
%global commit_date 20181002
|
||||
%endif
|
||||
%global shortcommit %(c=%{commit};echo ${c:0:8})
|
||||
%global gitrel .%{commit_date}git%{shortcommit}
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
%endif
|
||||
|
||||
Name: python-%{pkgname}
|
||||
Version: 64.0
|
||||
Version: 65.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
|
|
@ -61,6 +61,8 @@ 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 skip unreliable tests that result in Fedora build failures
|
||||
Patch0: avocado-65.0-skip-unreliable-selftests.patch
|
||||
|
||||
BuildRequires: procps-ng
|
||||
BuildRequires: kmod
|
||||
|
|
@ -145,6 +147,7 @@ these days a framework) to perform automated testing.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{gitref}
|
||||
%patch0
|
||||
# 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
|
||||
|
|
@ -1043,7 +1046,12 @@ GLib Test Framework.
|
|||
Summary: Avocado Test Framework Example Tests
|
||||
License: GPLv2
|
||||
# documentation does not require main package, but needs to be in lock-step if present
|
||||
Conflicts: python-%{pkgname} < %{version}-%{release}, python-%{pkgname} > %{version}-%{release}
|
||||
%if %{with python2}
|
||||
Conflicts: python2-%{pkgname} < %{version}-%{release}, python2-%{pkgname} > %{version}-%{release}
|
||||
%endif
|
||||
%if %{with python3}
|
||||
Conflicts: python3-%{pkgname} < %{version}-%{release}, python3-%{pkgname} > %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description -n python-%{pkgname}-examples
|
||||
The set of example tests present in the upstream tree of the Avocado framework.
|
||||
|
|
@ -1064,7 +1072,7 @@ examples of how to write tests on your own.
|
|||
|
||||
%package -n python-%{pkgname}-bash
|
||||
Summary: Avocado Test Framework Bash Utilities
|
||||
Requires: python-%{pkgname} == %{version}-%{release}
|
||||
Requires: python-%{pkgname}-common == %{version}-%{release}
|
||||
|
||||
%description -n python-%{pkgname}-bash
|
||||
A small set of utilities to interact with Avocado from the Bourne
|
||||
|
|
@ -1080,6 +1088,9 @@ Again Shell code (and possibly other similar shells).
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 04 2018 Merlin Mathesius <mmathesi@redhat.com> - 65.0-1
|
||||
- Sync with upstream release 65.0.
|
||||
|
||||
* Tue Aug 28 2018 Merlin Mathesius <mmathesi@redhat.com> - 64.0-1
|
||||
- Sync with upstream release 64.0.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue