Fix FTBFS error by disabling selfcheck producing false failures
Update SPEC to use pkgname instead of srcname macro where appropriate
This commit is contained in:
Merlin Mathesius
parent
ba6615c792
commit
0b146cc9d1
2 changed files with 60 additions and 42 deletions
|
|
@ -1,4 +1,5 @@
|
|||
%global srcname avocado
|
||||
%global pkgname avocado
|
||||
|
||||
# Conditional for release vs. snapshot builds. Set to 1 for release build.
|
||||
%if ! 0%{?rel_build:1}
|
||||
|
|
@ -31,9 +32,9 @@
|
|||
%global with_tests 0
|
||||
%endif
|
||||
|
||||
Name: python-%{srcname}
|
||||
Name: python-%{pkgname}
|
||||
Version: 52.0
|
||||
Release: 2%{?gitrel}%{?dist}
|
||||
Release: 3%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
# Found licenses:
|
||||
|
|
@ -49,6 +50,7 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{version}.tar.
|
|||
%else
|
||||
Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.gz#/%{gittar}
|
||||
%endif
|
||||
Patch0: avocado-selftest-doublefree-disable.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: fabric
|
||||
BuildRequires: pystache
|
||||
|
|
@ -115,10 +117,10 @@ Avocado is a set of tools and libraries (what people call
|
|||
these days a framework) to perform automated testing.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}
|
||||
%package -n python2-%{pkgname}
|
||||
Summary: %{summary}
|
||||
License: GPLv2 and MIT
|
||||
%{?python_provide:%python_provide python2-%{srcname}}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}}
|
||||
Requires: fabric
|
||||
Requires: gdb
|
||||
Requires: gdb-gdbserver
|
||||
|
|
@ -145,96 +147,96 @@ Requires: procps-ng
|
|||
%endif
|
||||
|
||||
|
||||
%description -n python2-%{srcname}
|
||||
%description -n python2-%{pkgname}
|
||||
Avocado is a set of tools and libraries (what people call
|
||||
these days a framework) to perform automated testing.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-output-html
|
||||
%package -n python2-%{pkgname}-plugins-output-html
|
||||
Summary: Avocado HTML report plugin
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-output-html}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-output-html}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
Requires: pystache
|
||||
|
||||
%description -n python2-%{srcname}-plugins-output-html
|
||||
%description -n python2-%{pkgname}-plugins-output-html
|
||||
Adds to avocado the ability to generate an HTML report at every job results
|
||||
directory. It also gives the user the ability to write a report on an
|
||||
arbitrary filesystem location.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-runner-remote
|
||||
%package -n python2-%{pkgname}-plugins-runner-remote
|
||||
Summary: Avocado Runner for Remote Execution
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-remote}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-remote}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
Requires: fabric
|
||||
%if 0%{?fedora} == 24
|
||||
Requires: python-crypto
|
||||
%endif
|
||||
|
||||
%description -n python2-%{srcname}-plugins-runner-remote
|
||||
%description -n python2-%{pkgname}-plugins-runner-remote
|
||||
Allows Avocado to run jobs on a remote machine, by means of an SSH
|
||||
connection. Avocado must be previously installed on the remote machine.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-runner-vm
|
||||
%package -n python2-%{pkgname}-plugins-runner-vm
|
||||
Summary: Avocado Runner for libvirt VM Execution
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-vm}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
Requires: python2-%{srcname}-plugins-runner-remote == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-vm}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release}
|
||||
Requires: libvirt-python
|
||||
|
||||
%description -n python2-%{srcname}-plugins-runner-vm
|
||||
%description -n python2-%{pkgname}-plugins-runner-vm
|
||||
Allows Avocado to run jobs on a libvirt based VM, by means of
|
||||
interaction with a libvirt daemon and an SSH connection to the VM
|
||||
itself. Avocado must be previously installed on the VM.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-runner-docker
|
||||
%package -n python2-%{pkgname}-plugins-runner-docker
|
||||
Summary: Avocado Runner for Execution on Docker Containers
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-runner-docker}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
Requires: python2-%{srcname}-plugins-runner-remote == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-docker}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release}
|
||||
Requires: python2-aexpect
|
||||
|
||||
%description -n python2-%{srcname}-plugins-runner-docker
|
||||
%description -n python2-%{pkgname}-plugins-runner-docker
|
||||
Allows Avocado to run jobs on a Docker container by interacting with a
|
||||
Docker daemon and attaching to the container itself. Avocado must
|
||||
be previously installed on the container.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-resultsdb
|
||||
%package -n python2-%{pkgname}-plugins-resultsdb
|
||||
Summary: Avocado plugin to propagate job results to ResultsDB
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-resultsdb}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
Requires: python-resultsdb_api
|
||||
|
||||
%description -n python2-%{srcname}-plugins-resultsdb
|
||||
%description -n python2-%{pkgname}-plugins-resultsdb
|
||||
Allows Avocado to send job results directly to a ResultsDB
|
||||
server.
|
||||
|
||||
|
||||
%package -n python2-%{srcname}-plugins-varianter-yaml-to-mux
|
||||
%package -n python2-%{pkgname}-plugins-varianter-yaml-to-mux
|
||||
Summary: Avocado plugin to generate variants out of yaml files
|
||||
%{?python_provide:%python_provide python2-%{srcname}-plugins-resultsdb}
|
||||
Requires: python2-%{srcname} == %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb}
|
||||
Requires: python2-%{pkgname} == %{version}-%{release}
|
||||
%if 0%{?rhel}
|
||||
Requires: python-yaml
|
||||
%else
|
||||
Requires: python2-yaml
|
||||
%endif
|
||||
|
||||
%description -n python2-%{srcname}-plugins-varianter-yaml-to-mux
|
||||
%description -n python2-%{pkgname}-plugins-varianter-yaml-to-mux
|
||||
Can be used to produce multiple test variants with test parameters
|
||||
defined in a yaml file(s).
|
||||
|
||||
|
||||
%package -n python-%{srcname}-examples
|
||||
%package -n python-%{pkgname}-examples
|
||||
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-%{srcname} < %{version}-%{release}, python-%{srcname} > %{version}-%{release}
|
||||
Conflicts: python-%{pkgname} < %{version}-%{release}, python-%{pkgname} > %{version}-%{release}
|
||||
|
||||
%description -n python-%{srcname}-examples
|
||||
%description -n python-%{pkgname}-examples
|
||||
The set of example tests present in the upstream tree of the Avocado framework.
|
||||
Some of them are used as functional tests of the framework, others serve as
|
||||
examples of how to write tests on your own.
|
||||
|
|
@ -246,6 +248,7 @@ examples of how to write tests on your own.
|
|||
%else
|
||||
%setup -q -n %{srcname}-%{commit}
|
||||
%endif
|
||||
%patch0 -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
|
||||
|
|
@ -332,7 +335,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
%endif
|
||||
|
||||
|
||||
%files -n python2-%{srcname}
|
||||
%files -n python2-%{pkgname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%dir %{_sysconfdir}/avocado
|
||||
|
|
@ -368,43 +371,47 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
%{_libexecdir}/avocado/avocado_warn
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-output-html
|
||||
%files -n python2-%{pkgname}-plugins-output-html
|
||||
%{python2_sitelib}/avocado_result_html/
|
||||
%{python2_sitelib}/avocado_framework_plugin_result_html-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-runner-remote
|
||||
%files -n python2-%{pkgname}-plugins-runner-remote
|
||||
%{python2_sitelib}/avocado_runner_remote/
|
||||
%{python2_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-runner-vm
|
||||
%files -n python2-%{pkgname}-plugins-runner-vm
|
||||
%{python2_sitelib}/avocado_runner_vm/
|
||||
%{python2_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-runner-docker
|
||||
%files -n python2-%{pkgname}-plugins-runner-docker
|
||||
%{python2_sitelib}/avocado_runner_docker/
|
||||
%{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-resultsdb
|
||||
%files -n python2-%{pkgname}-plugins-resultsdb
|
||||
%{python2_sitelib}/avocado_resultsdb/
|
||||
%{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python2-%{srcname}-plugins-varianter-yaml-to-mux
|
||||
%files -n python2-%{pkgname}-plugins-varianter-yaml-to-mux
|
||||
%{python2_sitelib}/avocado_varianter_yaml_to_mux/
|
||||
%{python2_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python2_version}.egg-info
|
||||
|
||||
|
||||
%files -n python-%{srcname}-examples
|
||||
%files -n python-%{pkgname}-examples
|
||||
%dir %{_docdir}/avocado
|
||||
%{_docdir}/avocado/tests
|
||||
%{_docdir}/avocado/wrappers
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 09 2017 Merlin Mathesius <mmathesi@redhat.com> - 52.0-3
|
||||
- Fix FTBFS error by disabling selfcheck producing false failures
|
||||
- Update SPEC to use pkgname instead of srcname macro where appropriate
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 52.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue